merged branch igorw/streaming (PR #3017)

fabpot · fabpot · commit 99f65ecb82fc · 2012-01-02T22:10:00.000+01:00
Commits ------- 7ae9348 [streaming] Document and test that Transfer-Encoding is absent 83c23ca [streaming] Do not set a Transfer-Encoding header of chunked Discussion ---------- [HttpFoundation] Do not set a Transfer-Encoding header of chunked for streaming responses Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes This is an adjustment to the streaming introduced in #2935. Apache expects the response to already be in chunked format when the Transfer-Encoding header is set to chunked, which causes it to not deliver the streamed body. If no Content-Length is set on the response (regardless of Transfer-Encoding), web servers will automatically switch to chunked Transfer-Encoding, and handle the chunking for you. I have tested this with Apache 2.2.2 and nginx 1.0.5. Testing with other webservers is appreciated.
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -70,7 +70,6 @@ public function prepare(Request $request)
     {
         if ('1.0' != $request->server->get('SERVER_PROTOCOL')) {
             $this->setProtocolVersion('1.1');
-            $this->headers->set('Transfer-Encoding', 'chunked');
         }
 
         $this->headers->set('Cache-Control', 'no-cache');
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/StreamedResponseTest.php b/tests/Symfony/Tests/Component/HttpFoundation/StreamedResponseTest.php
@@ -33,7 +33,7 @@ public function testPrepareWith11Protocol()
         $response->prepare($request);
 
         $this->assertEquals('1.1', $response->getProtocolVersion());
-        $this->assertEquals('chunked', $response->headers->get('Transfer-Encoding'));
+        $this->assertNotEquals('chunked', $response->headers->get('Transfer-Encoding'), 'Apache assumes responses with a Transfer-Encoding header set to chunked to already be encoded.');
         $this->assertEquals('no-cache, private', $response->headers->get('Cache-Control'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ public function prepare(Request $request)`
`70`	`70`	`{`
`71`	`71`	`if ('1.0' != $request->server->get('SERVER_PROTOCOL')) {`
`72`	`72`	`$this->setProtocolVersion('1.1');`
`73`		`- $this->headers->set('Transfer-Encoding', 'chunked');`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`$this->headers->set('Cache-Control', 'no-cache');`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testPrepareWith11Protocol()`
`33`	`33`	`$response->prepare($request);`
`34`	`34`
`35`	`35`	`$this->assertEquals('1.1', $response->getProtocolVersion());`
`36`		`- $this->assertEquals('chunked', $response->headers->get('Transfer-Encoding'));`
	`36`	`+ $this->assertNotEquals('chunked', $response->headers->get('Transfer-Encoding'), 'Apache assumes responses with a Transfer-Encoding header set to chunked to already be encoded.');`
`37`	`37`	`$this->assertEquals('no-cache, private', $response->headers->get('Cache-Control'));`
`38`	`38`	`}`
`39`	`39`