Fix the http client timeout

restsharp · May 25, 2024 · dcb11c0 · dcb11c0
1 parent 63daee1
commit dcb11c0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1,647 deletions.
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/package.json b/package.json
diff --git a/src/RestSharp/RestClient.cs b/src/RestSharp/RestClient.cs
@@ -17,6 +17,8 @@
 using System.Runtime.CompilerServices;
 using RestSharp.Serializers;
 
+// ReSharper disable InvertIf
+
 // ReSharper disable VirtualMemberCallInConstructor
 #pragma warning disable 618
 
@@ -72,7 +74,7 @@ public RestClient(
         }
 
         ConfigureSerializers(configureSerialization);
-        Options = new ReadOnlyRestClientOptions(options);
+        Options           = new ReadOnlyRestClientOptions(options);
         DefaultParameters = new DefaultParameters(Options);
 
         if (useClientFactory) {
@@ -90,8 +92,12 @@ HttpClient GetClient() {
             var handler = new HttpClientHandler();
             ConfigureHttpMessageHandler(handler, options);
             var finalHandler = options.ConfigureMessageHandler?.Invoke(handler) ?? handler;
-            var httpClient = new HttpClient(finalHandler);
+            var httpClient   = new HttpClient(finalHandler);
             ConfigureHttpClient(httpClient, options);
+
+            // We will use Options.Timeout in ExecuteAsInternalAsync method
+            httpClient.Timeout = Timeout.InfiniteTimeSpan;
+
             ConfigureDefaultParameters(options);
             configureDefaultHeaders?.Invoke(httpClient.DefaultRequestHeaders);
             return httpClient;
@@ -220,9 +226,6 @@ public RestClient(
         : this(new HttpClient(handler, disposeHandler), true, configureRestClient, configureSerialization) { }
 
     static void ConfigureHttpClient(HttpClient httpClient, RestClientOptions options) {
-        // We will use Options.Timeout in ExecuteAsInternalAsync method
-        httpClient.Timeout = Timeout.InfiniteTimeSpan;
-
         if (options.Expect100Continue != null) httpClient.DefaultRequestHeaders.ExpectContinue = options.Expect100Continue;
     }
 
@@ -231,21 +234,21 @@ static void ConfigureHttpMessageHandler(HttpClientHandler handler, RestClientOpt
 #if NET
         if (!OperatingSystem.IsBrowser()) {
 #endif
-            handler.UseCookies             = false;
-            handler.Credentials            = options.Credentials;
-            handler.UseDefaultCredentials  = options.UseDefaultCredentials;
-            handler.AutomaticDecompression = options.AutomaticDecompression;
-            handler.PreAuthenticate        = options.PreAuthenticate;
-            if (options.MaxRedirects.HasValue) handler.MaxAutomaticRedirections = options.MaxRedirects.Value;
-
-            if (options.RemoteCertificateValidationCallback != null)
-                handler.ServerCertificateCustomValidationCallback =
-                    (request, cert, chain, errors) => options.RemoteCertificateValidationCallback(request, cert, chain, errors);
-
-            if (options.ClientCertificates != null) {
-                handler.ClientCertificates.AddRange(options.ClientCertificates);
-                handler.ClientCertificateOptions = ClientCertificateOption.Manual;
-            }
+        handler.UseCookies             = false;
+        handler.Credentials            = options.Credentials;
+        handler.UseDefaultCredentials  = options.UseDefaultCredentials;
+        handler.AutomaticDecompression = options.AutomaticDecompression;
+        handler.PreAuthenticate        = options.PreAuthenticate;
+        if (options.MaxRedirects.HasValue) handler.MaxAutomaticRedirections = options.MaxRedirects.Value;
+
+        if (options.RemoteCertificateValidationCallback != null)
+            handler.ServerCertificateCustomValidationCallback =
+                (request, cert, chain, errors) => options.RemoteCertificateValidationCallback(request, cert, chain, errors);
+
+        if (options.ClientCertificates != null) {
+            handler.ClientCertificates.AddRange(options.ClientCertificates);
+            handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+        }
 #if NET
         }
 #endif
@@ -255,7 +258,7 @@ static void ConfigureHttpMessageHandler(HttpClientHandler handler, RestClientOpt
         // ReSharper disable once InvertIf
         if (!OperatingSystem.IsBrowser() && !OperatingSystem.IsIOS() && !OperatingSystem.IsTvOS()) {
 #endif
-            if (handler.SupportsProxy) handler.Proxy = options.Proxy;
+        if (handler.SupportsProxy) handler.Proxy = options.Proxy;
 #if NET
         }
 #endif
@@ -274,8 +277,8 @@ void ConfigureSerializers(ConfigureSerialization? configureSerialization) {
     void ConfigureDefaultParameters(RestClientOptions options) {
         if (options.UserAgent == null) return;
 
-        if (!options.AllowMultipleDefaultParametersWithSameName
-            && DefaultParameters.Any(parameter => parameter.Type == ParameterType.HttpHeader && parameter.Name == KnownHeaders.UserAgent))
+        if (!options.AllowMultipleDefaultParametersWithSameName &&
+            DefaultParameters.Any(parameter => parameter.Type == ParameterType.HttpHeader && parameter.Name == KnownHeaders.UserAgent))
             DefaultParameters.RemoveParameter(KnownHeaders.UserAgent, ParameterType.HttpHeader);
         DefaultParameters.AddParameter(Parameter.CreateParameter(KnownHeaders.UserAgent, options.UserAgent, ParameterType.HttpHeader));
     }
@@ -294,4 +297,4 @@ public void Dispose() {
         Dispose(true);
         GC.SuppressFinalize(this);
     }
-}
+}