Fix loop hanging if process is killed during handshake on Windows

amphp · Sep 19, 2017 · 03e7905 · 03e7905
1 parent ca8f78b
commit 03e7905
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/Internal/Windows/Handle.php b/lib/Internal/Windows/Handle.php
@@ -35,6 +35,9 @@ public function __construct() {
     /** @var Deferred[] */
     public $stdioDeferreds;
 
+    /** @var string */
+    public $childPidWatcher;
+
     /** @var string */
     public $connectTimeoutWatcher;
 

diff --git a/lib/Internal/Windows/SocketConnector.php b/lib/Internal/Windows/SocketConnector.php
@@ -97,7 +97,6 @@ private function readDataFromPendingClient($socket, int $length, PendingSocketCl
         $state->receivedDataBuffer = '';
 
         Loop::cancel($state->readWatcher);
-        Loop::cancel($state->timeoutWatcher);
 
         return $data;
     }
@@ -195,7 +194,9 @@ public function onReadableHandshakeAck($watcher, $socket) {
         $handle->sockets[$pendingClient->streamId] = $socket;
 
         if (count($handle->sockets) === 3) {
-            $pendingClient->readWatcher = Loop::onReadable($handle->sockets[0], [$this, 'onReadableChildPid'], $handle);
+            Loop::cancel($pendingClient->timeoutWatcher);
+
+            $handle->childPidWatcher = Loop::onReadable($handle->sockets[0], [$this, 'onReadableChildPid'], $handle);
             $handle->stdioDeferreds[0]->resolve(new ResourceOutputStream($handle->sockets[0]));
             $handle->stdioDeferreds[1]->resolve(new ResourceInputStream($handle->sockets[1]));
             $handle->stdioDeferreds[2]->resolve(new ResourceInputStream($handle->sockets[2]));
@@ -209,7 +210,7 @@ public function onReadableChildPid($watcher, $socket, Handle $handle) {
             return;
         }
 
-        Loop::cancel($watcher);
+        Loop::cancel($handle->childPidWatcher);
         Loop::cancel($handle->connectTimeoutWatcher);
 
         if (\strlen($data) !== 5) {