Merge pull request #113 from valga/gc

jsor · web-flow · commit 8c9e1ca09b94 · 2017-09-04T20:30:56.000+02:00
Reduce memory consumption for failed connections
diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -90,21 +90,26 @@ public function connect($uri)
 
         // wait for connection
 
-        return $this
-            ->waitForStreamOnce($socket)
-            ->then(array($this, 'checkConnectedSocket'))
-            ->then(array($this, 'handleConnectedSocket'));
+        return $this->waitForStreamOnce($socket);
     }
 
     private function waitForStreamOnce($stream)
     {
         $loop = $this->loop;
 
-        return new Promise\Promise(function ($resolve) use ($loop, $stream) {
-            $loop->addWriteStream($stream, function ($stream) use ($loop, $resolve) {
+        return new Promise\Promise(function ($resolve, $reject) use ($loop, $stream) {
+            $loop->addWriteStream($stream, function ($stream) use ($loop, $resolve, $reject) {
                 $loop->removeWriteStream($stream);
 
-                $resolve($stream);
+                // The following hack looks like the only way to
+                // detect connection refused errors with PHP's stream sockets.
+                if (false === stream_socket_get_name($stream, true)) {
+                    fclose($stream);
+
+                    $reject(new \RuntimeException('Connection refused'));
+                } else {
+                    $resolve(new Connection($stream, $loop));
+                }
             });
         }, function () use ($loop, $stream) {
             $loop->removeWriteStream($stream);
@@ -113,24 +118,4 @@ private function waitForStreamOnce($stream)
             throw new \RuntimeException('Cancelled while waiting for TCP/IP connection to be established');
         });
     }
-
-    /** @internal */
-    public function checkConnectedSocket($socket)
-    {
-        // The following hack looks like the only way to
-        // detect connection refused errors with PHP's stream sockets.
-        if (false === stream_socket_get_name($socket, true)) {
-            fclose($socket);
-
-            return Promise\reject(new \RuntimeException('Connection refused'));
-        }
-
-        return Promise\resolve($socket);
-    }
-
-    /** @internal */
-    public function handleConnectedSocket($socket)
-    {
-        return new Connection($socket, $this->loop);
-    }
 }
