Merge branch 'hotfix/169'

Close #169

Author: weierophinney

CHANGELOG.md

@@ -29,6 +29,10 @@ All notable changes to this project will be documented in this file, in reverse
   `SapiStreamEmitter` to implement a check for `isSeekable()` prior to attempts
   to rewind; this allows it to work with non-seekable streams such as the
   `CallbackStream`.
+- [#169](https://github.com/zendframework/zend-diactoros/pull/169) ensures that
+  response serialization always provides a `\r\n\r\n` sequence following the
+  headers, even when no message body is present, to ensure it conforms with RFC
+  7230.
 
 ## 1.3.5 - 2016-03-17
 

src/Response/Serializer.php

@@ -73,9 +73,8 @@ public static function toString(ResponseInterface $response)
         if (! empty($headers)) {
             $headers = "\r\n" . $headers;
         }
-        if (! empty($body)) {
-            $headers .= "\r\n\r\n";
-        }
+
+        $headers .= "\r\n\r\n";
 
         return sprintf(
             $format,

test/Response/SerializerTest.php

@@ -31,6 +31,19 @@ public function testSerializesBasicResponse()
         );
     }
 
+    public function testSerializesResponseWithoutBodyCorrectly()
+    {
+        $response = (new Response())
+            ->withStatus(200)
+            ->withAddedHeader('Content-Type', 'text/plain');
+
+        $message = Serializer::toString($response);
+        $this->assertEquals(
+            "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n",
+            $message
+        );
+    }
+
     public function testSerializesMultipleHeadersCorrectly()
     {
         $response = (new Response())