Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 0a40b543e411 · 2015-11-26T10:20:19.000+01:00
* 2.3:
  [HttpFoundation] Workaround HHVM rewriting HTTP response line

Conflicts:
	src/Symfony/Component/HttpFoundation/Response.php
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -329,16 +329,16 @@ public function sendHeaders()
             return $this;
         }
 
-        // status
-        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
-
         // headers
         foreach ($this->headers->allPreserveCase() as $name => $values) {
             foreach ($values as $value) {
-                header($name.': '.$value, false, $this->statusCode);
+                header($name.': '.$value, false);
             }
         }
 
+        // status
+        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
+
         // cookies
         foreach ($this->headers->getCookies() as $cookie) {
             setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());

Original file line number	Diff line number	Diff line change
`@@ -329,16 +329,16 @@ public function sendHeaders()`
`329`	`329`	`return $this;`
`330`	`330`	`}`
`331`	`331`
`332`		`- // status`
`333`		`- header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);`
`334`		`-`
`335`	`332`	`// headers`
`336`	`333`	`foreach ($this->headers->allPreserveCase() as $name => $values) {`
`337`	`334`	`foreach ($values as $value) {`
`338`		`- header($name.': '.$value, false, $this->statusCode);`
	`335`	`+ header($name.': '.$value, false);`
`339`	`336`	`}`
`340`	`337`	`}`
`341`	`338`
	`339`	`+ // status`
	`340`	`+ header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);`
	`341`	`+`
`342`	`342`	`// cookies`
`343`	`343`	`foreach ($this->headers->getCookies() as $cookie) {`
`344`	`344`	`setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());`