Bug fix: Timeout wasn't being set for HTTP proxies

Laiteux · Nov 16, 2020 · e7e740e · e7e740e
1 parent 0d8e522
commit e7e740e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2020 Matt
+Copyright (c) 2019-2021 Matt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Milky/Models/Proxy.cs b/src/Milky/Models/Proxy.cs
@@ -50,7 +50,10 @@ internal HttpClient GetHttpClient()
         {
             var httpMessageHandler = GetHttpMessageHandler();
 
-            var httpClient = new HttpClient(httpMessageHandler);
+            var httpClient = new HttpClient(httpMessageHandler)
+            {
+                Timeout = Settings.Timeout
+            };
 
             if (Settings.Backconnect)
             {
@@ -72,40 +75,38 @@ private HttpMessageHandler GetHttpMessageHandler()
                     CookieContainer = Settings.CookieContainer ?? new CookieContainer()
                 };
             }
-            else
+
+            var timeoutMilliseconds = (int)Settings.Timeout.TotalMilliseconds;
+
+            var proxySettings = new SocksSharp.Proxy.ProxySettings()
             {
-                var timeoutMilliseconds = (int)Settings.Timeout.TotalMilliseconds;
+                Host = Host, Port = Port,
+                Credentials = Credentials,
+                ConnectTimeout = timeoutMilliseconds,
+                ReadWriteTimeOut = timeoutMilliseconds
+            };
 
-                var proxySettings = new SocksSharp.Proxy.ProxySettings()
+            return Settings.Protocol switch
+            {
+                ProxyProtocol.SOCKS4 => new ProxyClientHandler<Socks4>(proxySettings)
                 {
-                    Host = Host, Port = Port,
-                    Credentials = Credentials,
-                    ConnectTimeout = timeoutMilliseconds,
-                    ReadWriteTimeOut = timeoutMilliseconds
-                };
-
-                return Settings.Protocol switch
+                    AllowAutoRedirect = Settings.AllowAutoRedirect,
+                    UseCookies = Settings.UseCookies,
+                    CookieContainer = Settings.CookieContainer
+                },
+                ProxyProtocol.SOCKS4a => new ProxyClientHandler<Socks4a>(proxySettings)
                 {
-                    ProxyProtocol.SOCKS4 => new ProxyClientHandler<Socks4>(proxySettings)
-                    {
-                        AllowAutoRedirect = Settings.AllowAutoRedirect,
-                        UseCookies = Settings.UseCookies,
-                        CookieContainer = Settings.CookieContainer
-                    },
-                    ProxyProtocol.SOCKS4a => new ProxyClientHandler<Socks4a>(proxySettings)
-                    {
-                        AllowAutoRedirect = Settings.AllowAutoRedirect,
-                        UseCookies = Settings.UseCookies,
-                        CookieContainer = Settings.CookieContainer
-                    },
-                    ProxyProtocol.SOCKS5 => new ProxyClientHandler<Socks5>(proxySettings)
-                    {
-                        AllowAutoRedirect = Settings.AllowAutoRedirect,
-                        UseCookies = Settings.UseCookies,
-                        CookieContainer = Settings.CookieContainer
-                    }
-                };
-            }
+                    AllowAutoRedirect = Settings.AllowAutoRedirect,
+                    UseCookies = Settings.UseCookies,
+                    CookieContainer = Settings.CookieContainer
+                },
+                ProxyProtocol.SOCKS5 => new ProxyClientHandler<Socks5>(proxySettings)
+                {
+                    AllowAutoRedirect = Settings.AllowAutoRedirect,
+                    UseCookies = Settings.UseCookies,
+                    CookieContainer = Settings.CookieContainer
+                }
+            };
         }
     }
 }