[HttpFoundation] fixed StreamedResponse with HEAD as a method (closes #4502)

fabpot · fabpot · commit 0f67ca88c1c5 · 2012-06-13T16:21:50.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -206,7 +206,7 @@ public function prepare(Request $request)
         $headers = $this->headers;
 
         if ($this->isInformational() || in_array($this->statusCode, array(204, 304))) {
-            $this->setContent('');
+            $this->setContent(null);
         }
 
         // Content-type based on the Request
@@ -234,7 +234,7 @@ public function prepare(Request $request)
         if ('HEAD' === $request->getMethod()) {
             // cf. RFC2616 14.13
             $length = $headers->get('Content-Length');
-            $this->setContent('');
+            $this->setContent(null);
             if ($length) {
                 $headers->set('Content-Length', $length);
             }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -581,7 +581,7 @@ protected function store(Request $request, Response $response)
     private function restoreResponseBody(Request $request, Response $response)
     {
         if ('HEAD' === $request->getMethod() || 304 === $response->getStatusCode()) {
-            $response->setContent('');
+            $response->setContent(null);
             $response->headers->remove('X-Body-Eval');
             $response->headers->remove('X-Body-File');
 

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ protected function store(Request $request, Response $response)`
`581`	`581`	`private function restoreResponseBody(Request $request, Response $response)`
`582`	`582`	`{`
`583`	`583`	`if ('HEAD' === $request->getMethod() \|\| 304 === $response->getStatusCode()) {`
`584`		`- $response->setContent('');`
	`584`	`+ $response->setContent(null);`
`585`	`585`	`$response->headers->remove('X-Body-Eval');`
`586`	`586`	`$response->headers->remove('X-Body-File');`
`587`	`587`