Fix connection cleanup when connecting to same IP multiple times

Author: clue

src/HappyEyeBallsConnectionBuilder.php

@@ -145,16 +145,20 @@ public function check($resolve, $reject)
     {
         $ip = \array_shift($this->connectQueue);
 
+        // start connection attempt and remember array position to later unset again
+        $this->connectionPromises[] = $this->attemptConnection($ip);
+        \end($this->connectionPromises);
+        $index = \key($this->connectionPromises);
+
         $that = $this;
-        $that->connectionPromises[$ip] = $this->attemptConnection($ip);
-        $that->connectionPromises[$ip]->then(function ($connection) use ($that, $ip, $resolve) {
-            unset($that->connectionPromises[$ip]);
+        $that->connectionPromises[$index]->then(function ($connection) use ($that, $index, $resolve) {
+            unset($that->connectionPromises[$index]);
 
             $that->cleanUp();
 
             $resolve($connection);
-        }, function (\Exception $e) use ($that, $ip, $resolve, $reject) {
-            unset($that->connectionPromises[$ip]);
+        }, function (\Exception $e) use ($that, $index, $resolve, $reject) {
+            unset($that->connectionPromises[$index]);
 
             $that->failureCount++;
 

tests/HappyEyeBallsConnectionBuilderTest.php

@@ -592,4 +592,33 @@ public function testCheckCallsRejectFunctionImmediateWithoutLeavingDanglingPromi
 
         $this->assertEquals(array(), $promises);
     }
+
+    public function testCleanUpCancelsAllPendingConnectionAttempts()
+    {
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+        $connector->expects($this->exactly(2))->method('connect')->with('tcp://[::1]:80/path?test=yes&hostname=reactphp.org#start')->willReturnOnConsecutiveCalls(
+            new Promise(function () { }, $this->expectCallableOnce()),
+            new Promise(function () { }, $this->expectCallableOnce())
+        );
+
+        $resolver = $this->getMockBuilder('React\Dns\Resolver\ResolverInterface')->getMock();
+        $resolver->expects($this->never())->method('resolveAll');
+
+        $uri = 'tcp://reactphp.org:80/path?test=yes#start';
+        $host = 'reactphp.org';
+        $parts = parse_url($uri);
+
+        $builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
+
+        $ref = new \ReflectionProperty($builder, 'connectQueue');
+        $ref->setAccessible(true);
+        $ref->setValue($builder, array('::1', '::1'));
+
+        $builder->check($this->expectCallableNever(), function () { });
+        $builder->check($this->expectCallableNever(), function () { });
+
+        $builder->cleanUp();
+    }
 }