Consistently use ECONNABORTED for cancelled connection attempts

Author: clue

src/DnsConnector.php

@@ -91,7 +91,10 @@ function ($_, $reject) use (&$promise, &$resolved, $uri) {
                 // cancellation should reject connection attempt
                 // reject DNS resolution with custom reason, otherwise rely on connection cancellation below
                 if ($resolved === null) {
-                    $reject(new \RuntimeException('Connection to ' . $uri . ' cancelled during DNS lookup'));
+                    $reject(new \RuntimeException(
+                        'Connection to ' . $uri . ' cancelled during DNS lookup',
+                        \defined('SOCKET_ECONNABORTED') ? \SOCKET_ECONNABORTED : 103
+                    ));
                 }
 
                 // (try to) cancel pending DNS lookup / connection attempt

src/HappyEyeBallsConnectionBuilder.php

@@ -103,7 +103,10 @@ public function connect()
                 return $deferred->promise();
             })->then($lookupResolve(Message::TYPE_A));
         }, function ($_, $reject) use ($that, &$timer) {
-            $reject(new \RuntimeException('Connection to ' . $that->uri . ' cancelled' . (!$that->connectionPromises ? ' during DNS lookup' : '')));
+            $reject(new \RuntimeException(
+                'Connection to ' . $that->uri . ' cancelled' . (!$that->connectionPromises ? ' during DNS lookup' : ''),
+                \defined('SOCKET_ECONNABORTED') ? \SOCKET_ECONNABORTED : 103
+            ));
             $_ = $reject = null;
 
             $that->cleanUp();

src/SecureConnector.php

@@ -105,7 +105,10 @@ function ($resolve, $reject) use ($promise) {
             },
             function ($_, $reject) use (&$promise, $uri, &$connected) {
                 if ($connected) {
-                    $reject(new \RuntimeException('Connection to ' . $uri . ' cancelled during TLS handshake'));
+                    $reject(new \RuntimeException(
+                        'Connection to ' . $uri . ' cancelled during TLS handshake',
+                        \defined('SOCKET_ECONNABORTED') ? \SOCKET_ECONNABORTED : 103
+                    ));
                 }
 
                 $promise->cancel();

src/TcpConnector.php

@@ -141,7 +141,10 @@ public function connect($uri)
             }
             // @codeCoverageIgnoreEnd
 
-            throw new \RuntimeException('Connection to ' . $uri . ' cancelled during TCP/IP handshake');
+            throw new \RuntimeException(
+                'Connection to ' . $uri . ' cancelled during TCP/IP handshake',
+                \defined('SOCKET_ECONNABORTED') ? \SOCKET_ECONNABORTED : 103
+            );
         });
     }
 }

tests/DnsConnectorTest.php

@@ -167,7 +167,11 @@ public function testCancelDuringDnsCancelsDnsAndDoesNotStartTcpConnection()
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.com:80 cancelled during DNS lookup');
+        $this->setExpectedException(
+            'RuntimeException',
+            'Connection to tcp://example.com:80 cancelled during DNS lookup',
+            defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103
+        );
         $this->throwRejection($promise);
     }
 
@@ -196,7 +200,10 @@ public function testCancelDuringTcpConnectionCancelsTcpConnectionWithTcpRejectio
         $first = new Deferred();
         $this->resolver->expects($this->once())->method('resolve')->with($this->equalTo('example.com'))->willReturn($first->promise());
         $pending = new Promise\Promise(function () { }, function () {
-            throw new \RuntimeException('Connection cancelled');
+            throw new \RuntimeException(
+                'Connection cancelled',
+                defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103
+            );
         });
         $this->tcp->expects($this->once())->method('connect')->with($this->equalTo('1.2.3.4:80?hostname=example.com'))->willReturn($pending);
 
@@ -205,7 +212,11 @@ public function testCancelDuringTcpConnectionCancelsTcpConnectionWithTcpRejectio
 
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection cancelled');
+        $this->setExpectedException(
+            'RuntimeException',
+            'Connection cancelled',
+            defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103
+        );
         $this->throwRejection($promise);
     }
 

tests/HappyEyeBallsConnectionBuilderTest.php

@@ -664,7 +664,10 @@ public function testCancelConnectWillRejectPromiseAndCancelBothDnsLookups()
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 cancelled during DNS lookup', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103, $exception->getCode());
     }
 
     public function testCancelConnectWillRejectPromiseAndCancelPendingIpv6LookupAndCancelDelayTimer()
@@ -701,7 +704,10 @@ public function testCancelConnectWillRejectPromiseAndCancelPendingIpv6LookupAndC
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 cancelled during DNS lookup', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103, $exception->getCode());
     }
 
     public function testCancelConnectWillRejectPromiseAndCancelPendingIpv6ConnectionAttemptAndPendingIpv4LookupAndCancelAttemptTimer()
@@ -744,7 +750,10 @@ public function testCancelConnectWillRejectPromiseAndCancelPendingIpv6Connection
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 cancelled', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103, $exception->getCode());
     }
 
     public function testResolveWillReturnResolvedPromiseWithEmptyListWhenDnsResolverFails()

tests/HappyEyeBallsConnectorTest.php

@@ -275,7 +275,11 @@ public function testCancelDuringDnsCancelsDnsAndDoesNotStartTcpConnection()
             $that->throwRejection($promise);
         });
 
-        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.com:80 cancelled during DNS lookup');
+        $this->setExpectedException(
+            'RuntimeException',
+            'Connection to tcp://example.com:80 cancelled during DNS lookup',
+            \defined('SOCKET_ECONNABORTED') ? \SOCKET_ECONNABORTED : 103
+        );
         $this->loop->run();
     }
 

tests/SecureConnectorTest.php

@@ -187,7 +187,11 @@ public function testCancelDuringStreamEncryptionCancelsEncryptionAndClosesConnec
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to tls://example.com:80 cancelled during TLS handshake');
+        $this->setExpectedException(
+            'RuntimeException',
+            'Connection to tls://example.com:80 cancelled during TLS handshake',
+            defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103
+        );
         $this->throwRejection($promise);
     }
 

tests/TcpConnectorTest.php

@@ -324,7 +324,11 @@ public function cancellingConnectionShouldRejectPromise()
         $promise = $connector->connect($server->getAddress());
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to ' . $server->getAddress() . ' cancelled during TCP/IP handshake');
+        $this->setExpectedException(
+            'RuntimeException',
+            'Connection to ' . $server->getAddress() . ' cancelled during TCP/IP handshake',
+            defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103
+        );
         Block\await($promise, $loop);
     }