Restore UnprocessedRequestException

src/Connection/DefaultConnectionFactory.php

@@ -109,10 +109,9 @@ public function create(Request $request, Cancellation $cancellation): Connection
  $cancellation->throwIfRequested();
 
  // Otherwise we ran into a timeout of our TimeoutCancellation
- throw new UnprocessedRequestException(new SocketException(\sprintf(
- "Connection to '%s' timed out, took longer than " . $request->getTcpConnectTimeout() . ' s',
- $authority
- )));
+ throw new UnprocessedRequestException(
+ new TimeoutException(\sprintf("Connection to '%s' timed out, took longer than " . $request->getTcpConnectTimeout() . ' s', $authority))
+ );
  }
 
  if ($isHttps) {
@@ -125,7 +124,9 @@ public function create(Request $request, Cancellation $cancellation): Connection
  if ($tlsState !== Socket\TlsState::Disabled) {
  $socket->close();
 
- throw new UnprocessedRequestException(new SocketException('Failed to setup TLS connection, connection was in an unexpected TLS state (' . $tlsState->name . ')'));
+ throw new UnprocessedRequestException(
+ new SocketException('Failed to setup TLS connection, connection was in an unexpected TLS state (' . $tlsState->name . ')')
+ );
  }
 
  $socket->setupTls(new CompositeCancellation(
@@ -158,11 +159,13 @@ public function create(Request $request, Cancellation $cancellation): Connection
  if ($tlsInfo === null) {
  $socket->close();
 
- throw new UnprocessedRequestException(new SocketException(\sprintf(
- "Socket closed after TLS handshake with '%s' @ '%s'",
- $authority,
- $socket->getRemoteAddress()->toString()
- )));
+ throw new UnprocessedRequestException(
+ new SocketException(\sprintf(
+ "Socket closed after TLS handshake with '%s' @ '%s'",
+ $authority,
+ $socket->getRemoteAddress()->toString()
+ ))
+ );
  }
 
  events()->tlsHandshakeEnd($request, $tlsInfo);
@@ -190,12 +193,12 @@ public function create(Request $request, Cancellation $cancellation): Connection
  if (!\array_intersect($request->getProtocolVersions(), ['1.0', '1.1'])) {
  $socket->close();
 
- throw new UnprocessedRequestException(new SocketException(\sprintf(
+ throw new InvalidRequestException($request, \sprintf(
  "None of the requested protocol versions (%s) are supported by '%s' @ '%s'",
  \implode(', ', $protocolVersions),
  $authority,
  $socket->getRemoteAddress()->toString()
- )));
+ ));
  }
 
  $http1Connection = new Http1Connection($socket);

src/Connection/Internal/Http2ConnectionProcessor.php

@@ -133,7 +133,9 @@ public function initialize(Cancellation $cancellation): void
  $this->initializeStarted = true;
 
  if ($this->socket->isClosed()) {
- throw new UnprocessedRequestException(new SocketException('The socket closed before the connection could be initialized'));
+ throw new UnprocessedRequestException(
+ new SocketException('The socket closed before the connection could be initialized')
+ );
  }
 
  $this->settings = new DeferredFuture;
@@ -145,9 +147,9 @@ public function initialize(Cancellation $cancellation): void
  try {
  $future->await($cancellation);
  } catch (CancelledException $exception) {
- $exception = new UnprocessedRequestException(new SocketException('Connecting cancelled', 0, $exception));
+ $exception = new SocketException('Connecting cancelled', 0, $exception);
  $this->shutdown($exception);
- throw $exception;
+ throw new UnprocessedRequestException($exception);
  }
  }
 
@@ -906,10 +908,12 @@ public function request(Request $request, Cancellation $cancellation, Stream $st
  }
 
  if ($this->hasTimeout && !$this->ping()->await()) {
- throw new UnprocessedRequestException(new SocketException(\sprintf(
- "Socket to '%s' missed responding to PINGs",
- $this->socket->getRemoteAddress()->toString()
- )));
+ throw new UnprocessedRequestException(
+ new SocketException(\sprintf(
+ "Socket to '%s' missed responding to PINGs",
+ $this->socket->getRemoteAddress()->toString()
+ ))
+ );
  }
 
  RequestNormalizer::normalizeRequest($request);
@@ -928,10 +932,12 @@ public function request(Request $request, Cancellation $cancellation, Stream $st
  $request->setProtocolVersions(['2']);
 
  if ($this->socket->isClosed()) {
- throw new UnprocessedRequestException(new SocketException(\sprintf(
- "Socket to '%s' closed before the request could be sent",
- $this->socket->getRemoteAddress()->toString()
- )));
+ throw new UnprocessedRequestException(
+ new SocketException(\sprintf(
+ "Socket to '%s' closed before the request could be sent",
+ $this->socket->getRemoteAddress()->toString()
+ ))
+ );
  }
 
  $body = $request->getBody()->getContent();

test/ClientHttpBinIntegrationTest.php

@@ -692,7 +692,7 @@ public function testNoMemoryLeak(): void
  $initialIdentifierCount ??= \count(EventLoop::getIdentifiers());
  $identifierCount = \count(EventLoop::getIdentifiers());
 
- self::assertLessThan(1, $identifierCount - $initialIdentifierCount);
+ self::assertLessThanOrEqual(1, $identifierCount - $initialIdentifierCount);
  }
  }
 

test/TimeoutTest.php

@@ -146,8 +146,8 @@ public function testTimeoutDuringTlsEnableCatchable(): void
  $this->client->request($request);
 
  self::fail('No exception thrown');
- } catch (TimeoutException $e) {
- self::assertStringStartsWith('TLS handshake with \'127.0.0.1:', $e->getMessage());
+ } catch (UnprocessedRequestException $e) {
+ self::assertStringStartsWith('TLS handshake with \'127.0.0.1:', $e->getPrevious()->getMessage());
  } finally {
  $server->close();
  }