Merge pull request #244 from clue-labs/accept-race

Fix possible `accept()` race condition when multiple socket servers listen on same socket address

Author: jsor

src/TcpServer.php

@@ -204,7 +204,7 @@ public function resume()
 
         $that = $this;
         $this->loop->addReadStream($this->master, function ($master) use ($that) {
-            $newSocket = @\stream_socket_accept($master);
+            $newSocket = @\stream_socket_accept($master, 0);
             if (false === $newSocket) {
                 $that->emit('error', array(new \RuntimeException('Error accepting new connection')));
 

src/UnixServer.php

@@ -106,7 +106,7 @@ public function resume()
 
         $that = $this;
         $this->loop->addReadStream($this->master, function ($master) use ($that) {
-            $newSocket = @\stream_socket_accept($master);
+            $newSocket = @\stream_socket_accept($master, 0);
             if (false === $newSocket) {
                 $that->emit('error', array(new \RuntimeException('Error accepting new connection')));
 

tests/TcpServerTest.php

@@ -280,8 +280,12 @@ public function testEmitsErrorWhenAcceptListenerFails()
 
         $this->assertNotNull($listener);
         $socket = stream_socket_server('tcp://127.0.0.1:0');
-        fclose($socket);
+
+        $time = microtime(true);
         $listener($socket);
+        $time = microtime(true) - $time;
+
+        $this->assertLessThan(1, $time);
     }
 
     public function testListenOnBusyPortThrows()

tests/UnixServerTest.php

@@ -285,8 +285,12 @@ public function testEmitsErrorWhenAcceptListenerFails()
 
         $this->assertNotNull($listener);
         $socket = stream_socket_server('tcp://127.0.0.1:0');
-        fclose($socket);
+
+        $time = microtime(true);
         $listener($socket);
+        $time = microtime(true) - $time;
+
+        $this->assertLessThan(1, $time);
     }
 
     public function testListenOnBusyPortThrows()