Always use ms scaled timeouts (#1785)

getsentry · Nov 5, 2024 · 93f0673 · 93f0673
1 parent af7955a
commit 93f0673
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/HttpClient/HttpClient.php b/src/HttpClient/HttpClient.php
@@ -64,27 +64,15 @@ public function sendRequest(Request $request, Options $options): Response
         curl_setopt($curlHandle, \CURLOPT_URL, $dsn->getEnvelopeApiEndpointUrl());
         curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, $requestHeaders);
         curl_setopt($curlHandle, \CURLOPT_USERAGENT, $this->sdkIdentifier . '/' . $this->sdkVersion);
+        curl_setopt($curlHandle, \CURLOPT_TIMEOUT_MS, $options->getHttpTimeout() * 1000);
+        curl_setopt($curlHandle, \CURLOPT_CONNECTTIMEOUT_MS, $options->getHttpConnectTimeout() * 1000);
         curl_setopt($curlHandle, \CURLOPT_ENCODING, '');
         curl_setopt($curlHandle, \CURLOPT_POST, true);
         curl_setopt($curlHandle, \CURLOPT_POSTFIELDS, $requestData);
         curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curlHandle, \CURLOPT_HEADERFUNCTION, $responseHeaderCallback);
         curl_setopt($curlHandle, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_1_1);
 
-        $httpTimeout = $options->getHttpTimeout();
-        if ($httpTimeout < 1.0) {
-            curl_setopt($curlHandle, \CURLOPT_TIMEOUT_MS, $httpTimeout * 1000);
-        } else {
-            curl_setopt($curlHandle, \CURLOPT_TIMEOUT, $httpTimeout);
-        }
-
-        $connectTimeout = $options->getHttpConnectTimeout();
-        if ($connectTimeout < 1.0) {
-            curl_setopt($curlHandle, \CURLOPT_CONNECTTIMEOUT_MS, $connectTimeout * 1000);
-        } else {
-            curl_setopt($curlHandle, \CURLOPT_CONNECTTIMEOUT, $connectTimeout);
-        }
-
         $httpSslVerifyPeer = $options->getHttpSslVerifyPeer();
         if (!$httpSslVerifyPeer) {
             curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, false);