Use HTTP/1.1 when compression is enabled (#1542)

Co-authored-by: Michael Hoffmann <[email protected]>

Author: stayallive

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.19.1
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v3.19.1.
+
+### Bug Fixes
+
+- Use HTTP/1.1 when compression is enabled [(#1542)](https://github.com/getsentry/sentry-php/pull/1542)
+
 ## 3.19.0
 
 The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v3.19.0.

phpstan-baseline.neon

@@ -55,6 +55,11 @@ parameters:
 			count: 1
 			path: src/HttpClient/HttpClientFactory.php
 
+		-
+			message: "#^Call to static method createWithConfig\\(\\) on an unknown class Http\\\\Adapter\\\\Guzzle6\\\\Client\\.$#"
+			count: 1
+			path: src/HttpClient/HttpClientFactory.php
+
 		-
 			message: "#^Constructor of class Sentry\\\\HttpClient\\\\HttpClientFactory has an unused parameter \\$responseFactory\\.$#"
 			count: 1

psalm-baseline.xml

@@ -9,7 +9,8 @@
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="src/HttpClient/HttpClientFactory.php">
-    <UndefinedClass occurrences="4">
+    <UndefinedClass occurrences="5">
+      <code>Guzzle6HttpClient</code>
       <code>GuzzleHttpClientOptions</code>
       <code>GuzzleHttpClientOptions</code>
       <code>GuzzleHttpClientOptions</code>

src/HttpClient/HttpClientFactory.php

@@ -5,7 +5,8 @@
 namespace Sentry\HttpClient;
 
 use GuzzleHttp\RequestOptions as GuzzleHttpClientOptions;
-use Http\Adapter\Guzzle6\Client as GuzzleHttpClient;
+use Http\Adapter\Guzzle6\Client as Guzzle6HttpClient;
+use Http\Adapter\Guzzle7\Client as Guzzle7HttpClient;
 use Http\Client\Common\Plugin\AuthenticationPlugin;
 use Http\Client\Common\Plugin\DecoderPlugin;
 use Http\Client\Common\Plugin\ErrorPlugin;
@@ -114,6 +115,7 @@ private function resolveClient(Options $options)
             $symfonyConfig = [
                 'timeout' => $options->getHttpConnectTimeout(),
                 'max_duration' => $options->getHttpTimeout(),
+                'http_version' => $options->isCompressionEnabled() ? '1.1' : null,
             ];
 
             if (null !== $options->getHttpProxy()) {
@@ -123,7 +125,7 @@ private function resolveClient(Options $options)
             return new SymfonyHttplugClient(SymfonyHttpClient::create($symfonyConfig));
         }
 
-        if (class_exists(GuzzleHttpClient::class)) {
+        if (class_exists(Guzzle7HttpClient::class) || class_exists(Guzzle6HttpClient::class)) {
             $guzzleConfig = [
                 GuzzleHttpClientOptions::TIMEOUT => $options->getHttpTimeout(),
                 GuzzleHttpClientOptions::CONNECT_TIMEOUT => $options->getHttpConnectTimeout(),
@@ -133,12 +135,17 @@ private function resolveClient(Options $options)
                 $guzzleConfig[GuzzleHttpClientOptions::PROXY] = $options->getHttpProxy();
             }
 
-            return GuzzleHttpClient::createWithConfig($guzzleConfig);
+            if (class_exists(Guzzle7HttpClient::class)) {
+                return Guzzle7HttpClient::createWithConfig($guzzleConfig);
+            }
+
+            return Guzzle6HttpClient::createWithConfig($guzzleConfig);
         }
 
         if (class_exists(CurlHttpClient::class)) {
             $curlConfig = [
                 \CURLOPT_TIMEOUT => $options->getHttpTimeout(),
+                \CURLOPT_HTTP_VERSION => $options->isCompressionEnabled() ? \CURL_HTTP_VERSION_1_1 : \CURL_HTTP_VERSION_NONE,
                 \CURLOPT_CONNECTTIMEOUT => $options->getHttpConnectTimeout(),
             ];