diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index ba4176b1371..78ffe928de6 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -57,11 +57,7 @@ class Client implements IClient { // Prefer HTTP/2 globally (PSR-7 request version) RequestOptions::VERSION => '2.0', ]; - // cURL hint: Prefer HTTP/2 (with ALPN); automatically falls back to 1.1. - $defaults['curl'][\CURLOPT_HTTP_VERSION] - = \defined('CURL_HTTP_VERSION_2TLS') ? \CURL_HTTP_VERSION_2TLS - : (\defined('CURL_HTTP_VERSION_2_0') ? \CURL_HTTP_VERSION_2_0 - : \CURL_HTTP_VERSION_NONE); + $defaults['curl'][\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2TLS; $options['nextcloud']['allow_local_address'] = $this->isLocalAddressAllowed($options); if ($options['nextcloud']['allow_local_address'] === false) { diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php index 795168bb8de..69668e7da51 100644 --- a/tests/lib/Http/Client/ClientTest.php +++ b/tests/lib/Http/Client/ClientTest.php @@ -278,11 +278,6 @@ class ClientTest extends \Test\TestCase { $acceptEnc = function_exists('brotli_uncompress') ? 'br, gzip' : 'gzip'; - // compute curl http version hint like in production code - $curlVersion = \defined('CURL_HTTP_VERSION_2TLS') - ? \CURL_HTTP_VERSION_2TLS - : (\defined('CURL_HTTP_VERSION_2_0') ? \CURL_HTTP_VERSION_2_0 : \CURL_HTTP_VERSION_NONE); - $this->defaultRequestOptions = [ 'verify' => '/my/path.crt', 'proxy' => [ @@ -299,7 +294,7 @@ class ClientTest extends \Test\TestCase { ], 'version' => '2.0', 'curl' => [ - \CURLOPT_HTTP_VERSION => $curlVersion, + \CURLOPT_HTTP_VERSION => \CURL_HTTP_VERSION_2TLS, ], ]; } @@ -479,11 +474,6 @@ class ClientTest extends \Test\TestCase { $acceptEnc = function_exists('brotli_uncompress') ? 'br, gzip' : 'gzip'; - // compute curl http version hint like in production code - $curlVersion = \defined('CURL_HTTP_VERSION_2TLS') - ? \CURL_HTTP_VERSION_2TLS - : (\defined('CURL_HTTP_VERSION_2_0') ? \CURL_HTTP_VERSION_2_0 : \CURL_HTTP_VERSION_NONE); - $this->assertEquals([ 'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt', 'headers' => [ @@ -504,7 +494,7 @@ class ClientTest extends \Test\TestCase { ], 'version' => '2.0', 'curl' => [ - \CURLOPT_HTTP_VERSION => $curlVersion, + \CURLOPT_HTTP_VERSION => \CURL_HTTP_VERSION_2TLS, ], ], self::invokePrivate($this->client, 'buildRequestOptions', [[]])); } @@ -537,11 +527,6 @@ class ClientTest extends \Test\TestCase { $acceptEnc = function_exists('brotli_uncompress') ? 'br, gzip' : 'gzip'; - // compute curl http version hint like in production code - $curlVersion = \defined('CURL_HTTP_VERSION_2TLS') - ? \CURL_HTTP_VERSION_2TLS - : (\defined('CURL_HTTP_VERSION_2_0') ? \CURL_HTTP_VERSION_2_0 : \CURL_HTTP_VERSION_NONE); - $this->assertEquals([ 'verify' => '/my/path.crt', 'proxy' => [ @@ -566,7 +551,7 @@ class ClientTest extends \Test\TestCase { ], 'version' => '2.0', 'curl' => [ - \CURLOPT_HTTP_VERSION => $curlVersion, + \CURLOPT_HTTP_VERSION => \CURL_HTTP_VERSION_2TLS, ], ], self::invokePrivate($this->client, 'buildRequestOptions', [[]])); } @@ -599,11 +584,6 @@ class ClientTest extends \Test\TestCase { $acceptEnc = function_exists('brotli_uncompress') ? 'br, gzip' : 'gzip'; - // compute curl http version hint like in production code - $curlVersion = \defined('CURL_HTTP_VERSION_2TLS') - ? \CURL_HTTP_VERSION_2TLS - : (\defined('CURL_HTTP_VERSION_2_0') ? \CURL_HTTP_VERSION_2_0 : \CURL_HTTP_VERSION_NONE); - $this->assertEquals([ 'verify' => '/my/path.crt', 'proxy' => [ @@ -629,7 +609,7 @@ class ClientTest extends \Test\TestCase { ], 'version' => '2.0', 'curl' => [ - \CURLOPT_HTTP_VERSION => $curlVersion, + \CURLOPT_HTTP_VERSION => \CURL_HTTP_VERSION_2TLS, ], ], self::invokePrivate($this->client, 'buildRequestOptions', [[]])); }