Merge pull request #248 from clue-labs/set-cookie

Support sending same response header multiple times (e.g. Set-Cookie)

Author: jsor

src/Server.php

@@ -3,15 +3,16 @@
 namespace React\Http;
 
 use Evenement\EventEmitter;
-use React\Socket\ServerInterface;
-use React\Socket\ConnectionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use React\Promise\Promise;
-use RingCentral\Psr7 as Psr7Implementation;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Promise\CancellablePromiseInterface;
+use React\Promise\Promise;
+use React\Socket\ConnectionInterface;
+use React\Socket\ServerInterface;
+use React\Stream\ReadableStreamInterface;
 use React\Stream\WritableStreamInterface;
+use RingCentral\Psr7 as Psr7Implementation;
 
 /**
  * The `Server` class is responsible for handling incoming connections and then
@@ -378,19 +379,26 @@ public function handleResponse(ConnectionInterface $connection, ServerRequestInt
 
     private function handleResponseBody(ResponseInterface $response, ConnectionInterface $connection)
     {
-        if (!$response->getBody() instanceof HttpBodyStream) {
-            $connection->write(Psr7Implementation\str($response));
-            return $connection->end();
+        $headers = "HTTP/" . $response->getProtocolVersion() . " " . $response->getStatusCode() . " " . $response->getReasonPhrase() . "\r\n";
+        foreach ($response->getHeaders() as $name => $values) {
+            foreach ($values as $value) {
+                $headers .= $name . ": " . $value . "\r\n";
+            }
         }
 
         $stream = $response->getBody();
 
+        if (!$stream instanceof ReadableStreamInterface) {
+            $connection->write($headers . "\r\n" . $stream);
+            return $connection->end();
+        }
+
         // close response stream if connection is already closed
         if (!$connection->isWritable()) {
             return $stream->close();
         }
 
-        $connection->write(Psr7Implementation\str($response));
+        $connection->write($headers . "\r\n");
 
         if ($stream->isReadable()) {
             if ($response->getHeaderLine('Transfer-Encoding') === 'chunked') {

tests/ServerTest.php

@@ -2331,6 +2331,44 @@ function ($data) use (&$buffer) {
         $this->assertContains("\r\n\r\n", $buffer);
     }
 
+    public function testAddMultipleCookieHeaders()
+    {
+        $server = new Server(function (ServerRequestInterface $request) {
+            return new Response(
+                200,
+                array(
+                    'Set-Cookie' => array(
+                        'name=test',
+                        'session=abc'
+                    ),
+                    'Date' => '',
+                    'X-Powered-By' => ''
+                )
+            );
+        });
+
+        $buffer = '';
+        $this->connection
+            ->expects($this->any())
+            ->method('write')
+            ->will(
+                $this->returnCallback(
+                    function ($data) use (&$buffer) {
+                        $buffer .= $data;
+                    }
+                )
+            );
+
+        $server->listen($this->socket);
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = $this->createGetRequest();
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertEquals("HTTP/1.1 200 OK\r\nSet-Cookie: name=test\r\nSet-Cookie: session=abc\r\nContent-Length: 0\r\nConnection: close\r\n\r\n", $buffer);
+    }
+
     public function testOnlyChunkedEncodingIsAllowedForTransferEncoding()
     {
         $error = null;