diff --git a/composer.json b/composer.json index 75ab46e..19031d9 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "amphp/dns": "^2.2", "amphp/http-client": "^5", "amphp/http-client-psr7": "^1", + "amphp/http-tunnel": "^2.0", "amphp/socket": "^2.3", "guzzlehttp/guzzle": "^7", "guzzlehttp/promises": "^1 || ^2", @@ -42,7 +43,6 @@ }, "require-dev": { "amphp/file": "^3.0", - "amphp/http-tunnel": "^2", "amphp/php-cs-fixer-config": "^2", "amphp/phpunit-util": "^3", "phpunit/phpunit": "^9", diff --git a/src/GuzzleHandlerAdapter.php b/src/GuzzleHandlerAdapter.php index 6ae0171..3f2bbb2 100644 --- a/src/GuzzleHandlerAdapter.php +++ b/src/GuzzleHandlerAdapter.php @@ -19,11 +19,11 @@ use Amp\Http\Client\Response; use Amp\Http\Tunnel\Http1TunnelConnector; use Amp\Http\Tunnel\Https1TunnelConnector; -use Amp\Http\Tunnel\Socks5TunnelConnector; use Amp\Socket\Certificate; use Amp\Socket\ClientTlsContext; use Amp\Socket\ConnectContext; use Amp\Socket\SocketConnector; +use Amp\Socket\Socks5SocketConnector; use AssertionError; use GuzzleHttp\Promise\Promise; use GuzzleHttp\Promise\PromiseInterface; @@ -255,7 +255,7 @@ private static function getConnector(AmpRequest $request, array $options): ?Sock if ($userInfo !== '') { [$user, $password] = \explode(':', $userInfo, 2) + [null, null]; } - return new Socks5TunnelConnector($uri->getHost() . ':' . $uri->getPort(), $user, $password); + return new Socks5SocketConnector($uri->getHost() . ':' . $uri->getPort(), $user, $password); } $headers = [];