Merge branch 'master' of https://github.com/kuwabarahiroshi/zf2

bakura10 · Sep 4, 2012 · b5f1a44 · b5f1a44
2 parents ef90275 + d2cfcce
commit b5f1a44
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/library/Zend/Http/Response.php b/library/Zend/Http/Response.php
@@ -180,7 +180,7 @@ public static function fromString($string)
 
         $response = new static();
 
-        $regex   = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.+))?$/';
+        $regex   = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.*))?$/';
         $matches = array();
         if (!preg_match($regex, $firstLine, $matches)) {
             throw new Exception\InvalidArgumentException(

diff --git a/tests/ZendTest/Http/ResponseTest.php b/tests/ZendTest/Http/ResponseTest.php
@@ -73,6 +73,21 @@ public function testResponseEndsAtStatusCode()
         $this->assertEquals('Foo Bar', $response->getContent());
     }
 
+    public function testResponseHasZeroLengthReasonPhrase()
+    {
+        // Space after status code is mandatory,
+        // though, reason phrase can be empty.
+        // @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6.1
+        $string = 'HTTP/1.0 200 ' . "\r\n\r\n" . 'Foo Bar';
+
+        $response = Response::fromString($string);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('Foo Bar', $response->getContent());
+
+        // Reason phrase would fallback to default reason phrase.
+        $this->assertEquals('OK', $response->getReasonPhrase());
+    }
+
     public function testGzipResponse ()
     {
         $response_text = file_get_contents(__DIR__ . '/_files/response_gzip');