minor symfony#13115 [HttpFoundation] removed wrong HTTP header (fabpot)

fabpot · fabpot · commit 1c039ce18d9d · 2014-12-26T10:45:06.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpFoundation] removed wrong HTTP header | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#12194 | License | MIT | Doc PR | n/a Commits ------- 73dddac [HttpFoundation] removed wrong HTTP header
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -170,7 +170,6 @@ public function prepare(Request $request)
     {
         $this->headers->set('Content-Length', $this->file->getSize());
         $this->headers->set('Accept-Ranges', 'bytes');
-        $this->headers->set('Content-Transfer-Encoding', 'binary');
 
         if (!$this->headers->has('Content-Type')) {
             $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');
diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -77,7 +77,6 @@ public function testRequests($requestRange, $offset, $length, $responseRange)
         $response->sendContent();
 
         $this->assertEquals(206, $response->getStatusCode());
-        $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
         $this->assertEquals($responseRange, $response->headers->get('Content-Range'));
     }
 
@@ -113,7 +112,6 @@ public function testFullFileRequests($requestRange)
         $response->sendContent();
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
     }
 
     public function provideFullFileRanges()
@@ -144,7 +142,6 @@ public function testInvalidRequests($requestRange)
         $response->sendContent();
 
         $this->assertEquals(416, $response->getStatusCode());
-        $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
         #$this->assertEquals('', $response->headers->get('Content-Range'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ public function prepare(Request $request)`
`170`	`170`	`{`
`171`	`171`	`$this->headers->set('Content-Length', $this->file->getSize());`
`172`	`172`	`$this->headers->set('Accept-Ranges', 'bytes');`
`173`		`- $this->headers->set('Content-Transfer-Encoding', 'binary');`
`174`	`173`
`175`	`174`	`if (!$this->headers->has('Content-Type')) {`
`176`	`175`	`$this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ public function testRequests($requestRange, $offset, $length, $responseRange)`
`77`	`77`	`$response->sendContent();`
`78`	`78`
`79`	`79`	`$this->assertEquals(206, $response->getStatusCode());`
`80`		`- $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));`
`81`	`80`	`$this->assertEquals($responseRange, $response->headers->get('Content-Range'));`
`82`	`81`	`}`
`83`	`82`
`@@ -113,7 +112,6 @@ public function testFullFileRequests($requestRange)`
`113`	`112`	`$response->sendContent();`
`114`	`113`
`115`	`114`	`$this->assertEquals(200, $response->getStatusCode());`
`116`		`- $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`public function provideFullFileRanges()`
`@@ -144,7 +142,6 @@ public function testInvalidRequests($requestRange)`
`144`	`142`	`$response->sendContent();`
`145`	`143`
`146`	`144`	`$this->assertEquals(416, $response->getStatusCode());`
`147`		`- $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));`
`148`	`145`	`#$this->assertEquals('', $response->headers->get('Content-Range'));`
`149`	`146`	`}`
`150`	`147`