merged branch chx/master (PR #5175)

fabpot · fabpot · commit 532334d23dd1 · 2012-08-04T11:17:16.000+02:00
Commits ------- b00ea41 StreamedResponse always sends a HTTP 1.1 response Discussion ---------- StreamedResponse always sends a HTTP 1.1 response SERVER_PROTOCOL is "Name and revision of the information protocol via which the page was requested; i.e. 'HTTP/1.0'". The condition was for 1.0 which is wrong. Earlier I filed #5173 --------------------------------------------------------------------------- by travisbot at 2012-08-03T18:33:45Z This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2030496) (merged b00ea41 into be41ca3). --------------------------------------------------------------------------- by chx at 2012-08-03T18:36:58Z Seems to me that the Travis fails have absolutely nothing to do with my patch.
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -76,7 +76,7 @@ public function setCallback($callback)
      */
     public function prepare(Request $request)
     {
-        if ('1.0' != $request->server->get('SERVER_PROTOCOL')) {
+        if ('HTTP 1.0' != $request->server->get('SERVER_PROTOCOL')) {
             $this->setProtocolVersion('1.1');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function setCallback($callback)`
`76`	`76`	`*/`
`77`	`77`	`public function prepare(Request $request)`
`78`	`78`	`{`
`79`		`- if ('1.0' != $request->server->get('SERVER_PROTOCOL')) {`
	`79`	`+ if ('HTTP 1.0' != $request->server->get('SERVER_PROTOCOL')) {`
`80`	`80`	`$this->setProtocolVersion('1.1');`
`81`	`81`	`}`
`82`	`82`