Merge pull request #5531 from cakephp/3.0-no-auto-content-length

Removing automatic setting of content-length header in Response.

src/Network/Response.php

@@ -419,7 +419,6 @@ class Response
         }
 
         $this->_setContent();
-        $this->_setContentLength();
         $this->sendHeaders();
 
         if ($this->_file) {
@@ -521,29 +520,6 @@ class Response
     }
 
     /**
-     * Calculates the correct Content-Length and sets it as a header in the response
-     * Will not set the value if already set or if the output is compressed.
-     *
-     * @return void
-     */
-    protected function _setContentLength()
-    {
-        $shouldSetLength = !isset($this->_headers['Content-Length']) && !in_array($this->_status, range(301, 307));
-        if (isset($this->_headers['Content-Length']) && $this->_headers['Content-Length'] === false) {
-            unset($this->_headers['Content-Length']);
-            return;
-        }
-        if ($shouldSetLength && !$this->outputCompressed()) {
-            $offset = ob_get_level() ? ob_get_length() : 0;
-            if (ini_get('mbstring.func_overload') & 2) {
-                $this->length($offset + mb_strlen($this->_body, '8bit'));
-            } else {
-                $this->length($this->_headers['Content-Length'] = $offset + strlen($this->_body));
-            }
-        }
-    }
-
-    /**
      * Sends a header to the client.
      *
      * @param string $name the header name

tests/TestCase/Network/ResponseTest.php

@@ -234,8 +234,6 @@ class ResponseTest extends TestCase
         $response->expects($this->at(5))
             ->method('_sendHeader')->with('Access-Control-Allow-Origin', 'domain2');
         $response->expects($this->at(6))
-            ->method('_sendHeader')->with('Content-Length', 17);
-        $response->expects($this->at(7))
             ->method('_sendHeader')->with('Content-Type', 'text/html; charset=UTF-8');
         $response->send();
     }
@@ -272,8 +270,6 @@ class ResponseTest extends TestCase
         $response->expects($this->at(1))
             ->method('_sendHeader')->with('HTTP/1.1 200 OK');
         $response->expects($this->at(2))
-            ->method('_sendHeader')->with('Content-Length', 17);
-        $response->expects($this->at(3))
             ->method('_sendHeader')->with('Content-Type', $expected);
         $response->send();
     }
@@ -295,8 +291,6 @@ class ResponseTest extends TestCase
         $response->expects($this->at(1))
             ->method('_sendHeader')->with('HTTP/1.1 200 OK');
         $response->expects($this->at(2))
-            ->method('_sendHeader')->with('Content-Length', 17);
-        $response->expects($this->at(3))
             ->method('_sendHeader')->with('Content-Type', 'application/javascript');
         $response->send();
     }
@@ -531,80 +525,6 @@ class ResponseTest extends TestCase
     }
 
     /**
-     * Tests the send and setting of Content-Length
-     *
-     * @return void
-     */
-    public function testSendContentLength()
-    {
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $response->body('the response body');
-        $response->expects($this->once())->method('_sendContent')->with('the response body');
-        $response->expects($this->at(0))
-            ->method('_sendHeader')->with('HTTP/1.1 200 OK');
-        $response->expects($this->at(2))
-            ->method('_sendHeader')->with('Content-Type', 'text/html; charset=UTF-8');
-        $response->expects($this->at(1))
-            ->method('_sendHeader')->with('Content-Length', strlen('the response body'));
-        $response->send();
-
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $body = '長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？';
-        $response->body($body);
-        $response->expects($this->once())->method('_sendContent')->with($body);
-        $response->expects($this->at(0))
-            ->method('_sendHeader')->with('HTTP/1.1 200 OK');
-        $response->expects($this->at(2))
-            ->method('_sendHeader')->with('Content-Type', 'text/html; charset=UTF-8');
-        $response->expects($this->at(1))
-            ->method('_sendHeader')->with('Content-Length', 116);
-        $response->send();
-
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent', 'outputCompressed']);
-        $body = '長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？';
-        $response->body($body);
-        $response->expects($this->once())->method('outputCompressed')->will($this->returnValue(true));
-        $response->expects($this->once())->method('_sendContent')->with($body);
-        $response->expects($this->exactly(2))->method('_sendHeader');
-        $response->send();
-
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent', 'outputCompressed']);
-        $body = 'hwy';
-        $response->body($body);
-        $response->header('Content-Length', 1);
-        $response->expects($this->never())->method('outputCompressed');
-        $response->expects($this->once())->method('_sendContent')->with($body);
-        $response->expects($this->at(1))
-                ->method('_sendHeader')->with('Content-Length', 1);
-        $response->send();
-
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $body = 'content';
-        $response->statusCode(301);
-        $response->body($body);
-        $response->expects($this->once())->method('_sendContent')->with($body);
-        $response->expects($this->exactly(2))->method('_sendHeader');
-        $response->send();
-
-        ob_start();
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $goofyOutput = 'I am goofily sending output in the controller';
-        echo $goofyOutput;
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $body = '長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？';
-        $response->body($body);
-        $response->expects($this->once())->method('_sendContent')->with($body);
-        $response->expects($this->at(0))
-            ->method('_sendHeader')->with('HTTP/1.1 200 OK');
-        $response->expects($this->at(1))
-            ->method('_sendHeader')->with('Content-Length', strlen($goofyOutput) + 116);
-        $response->expects($this->at(2))
-            ->method('_sendHeader')->with('Content-Type', 'text/html; charset=UTF-8');
-        $response->send();
-        ob_end_clean();
-    }
-
-    /**
      * Tests getting/setting the protocol
      *
      * @return void
@@ -632,13 +552,6 @@ class ResponseTest extends TestCase
         $response->expects($this->at(1))
             ->method('_sendHeader')->with('Content-Length', 100);
         $response->send();
-
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', '_sendContent']);
-        $response->length(false);
-        $this->assertFalse($response->length());
-        $response->expects($this->exactly(2))
-            ->method('_sendHeader');
-        $response->send();
     }
 
     /**
@@ -1248,10 +1161,6 @@ class ResponseTest extends TestCase
             ->method('header')
             ->with('Accept-Ranges', 'bytes');
 
-        $response->expects($this->at(2))
-            ->method('header')
-            ->with('Content-Length', 38);
-
         $response->expects($this->once())->method('_clearBuffer');
         $response->expects($this->once())->method('_flushBuffer');
 
@@ -1303,10 +1212,6 @@ class ResponseTest extends TestCase
             ->method('header')
             ->with('Accept-Ranges', 'bytes');
 
-        $response->expects($this->at(4))
-            ->method('header')
-            ->with('Content-Length', 38);
-
         $response->expects($this->once())->method('_clearBuffer');
         $response->expects($this->once())->method('_flushBuffer');
 
@@ -1367,10 +1272,6 @@ class ResponseTest extends TestCase
             ->method('header')
             ->with('Accept-Ranges', 'bytes');
 
-        $response->expects($this->at(4))
-            ->method('header')
-            ->with('Content-Length', 35);
-
         $response->expects($this->once())->method('_clearBuffer');
         $response->expects($this->once())->method('_flushBuffer');
 
@@ -1433,10 +1334,6 @@ class ResponseTest extends TestCase
             ->method('header')
             ->with('Accept-Ranges', 'bytes');
 
-        $response->expects($this->at(5))
-            ->method('header')
-            ->with('Content-Length', 35);
-
         $response->expects($this->once())->method('_clearBuffer');
         $response->expects($this->once())->method('_flushBuffer');
         $response->expects($this->exactly(1))
@@ -1498,10 +1395,6 @@ class ResponseTest extends TestCase
             ->method('header')
             ->with('Accept-Ranges', 'bytes');
 
-        $response->expects($this->at(5))
-            ->method('header')
-            ->with('Content-Length', 35);
-
         $response->expects($this->once())->method('_clearBuffer');
         $response->expects($this->once())->method('_flushBuffer');
         $response->expects($this->exactly(1))