Merge pull request #282 from WyriHaximus/server-forward-errors

Server should forward the error event from StreamingServer

Author: clue

README.md

@@ -60,6 +60,8 @@ calculate a sensible limit. It assumes a maximum of a quarter of the `memory_lim
 buffering and the other three quarter for parsing and handling the requests. The limit is 
 division of half of `memory_limit` by `memory_limit` rounded up.
 
+> Note that any errors emitted by the wrapped `StreamingServer` are forwarded by `Server`.
+
 ### StreamingServer
 
 The `StreamingServer` class is responsible for handling incoming connections and then

src/Server.php

@@ -2,6 +2,7 @@
 
 namespace React\Http;
 
+use Evenement\EventEmitter;
 use React\Http\Io\IniUtil;
 use React\Http\Middleware\LimitConcurrentRequestsMiddleware;
 use React\Http\Middleware\RequestBodyBufferMiddleware;
@@ -29,8 +30,10 @@
  * - file_uploads
  * - max_file_uploads
  * - enable_post_data_reading
+ *
+ * Forwards the error event coming from StreamingServer.
  */
-final class Server
+final class Server extends EventEmitter
 {
     /**
      * @internal
@@ -66,6 +69,11 @@ public function __construct($callback)
         $middleware[] = $callback;
 
         $this->streamingServer = new StreamingServer($middleware);
+
+        $that = $this;
+        $this->streamingServer->on('error', function ($error) use ($that) {
+            $that->emit('error', array($error));
+        });
     }
 
     /**

tests/ServerTest.php

@@ -4,15 +4,11 @@
 
 use React\EventLoop\Factory;
 use React\EventLoop\Timer\TimerInterface;
-use React\Http\MiddlewareRunner;
 use React\Http\Server;
-use React\Http\StreamingServer;
 use Psr\Http\Message\ServerRequestInterface;
-use React\Http\Response;
 use React\Promise\Deferred;
 use Clue\React\Block;
-use React\Stream\ThroughStream;
-use React\Promise\Promise;
+use React\Promise;
 
 final class ServerTest extends TestCase
 {
@@ -81,6 +77,28 @@ public function testPostFileUpload()
         $this->assertSame("hello\r\n", (string)$files['file']->getStream());
     }
 
+    public function testForwardErrors()
+    {
+        $exception = new \Exception();
+        $capturedException = null;
+        $server = new Server(function () use ($exception) {
+            return Promise\reject($exception);
+        });
+        $server->on('error', function ($error) use (&$capturedException) {
+            $capturedException = $error;
+        });
+
+        $server->listen($this->socket);
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = $this->createPostFileUploadRequest();
+        $this->connection->emit('data', array(implode('', $data)));
+
+        $this->assertInstanceOf('RuntimeException', $capturedException);
+        $this->assertInstanceOf('Exception', $capturedException->getPrevious());
+        $this->assertSame($exception, $capturedException->getPrevious());
+    }
+
     private function createPostFileUploadRequest()
     {
         $boundary = "---------------------------5844729766471062541057622570";