Bug fix

ShootMe · Sep 18, 2024 · f3e3153 · f3e3153
1 parent 101ec10
commit f3e3153
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Entities/ApiWebClient.cs b/Entities/ApiWebClient.cs
@@ -24,7 +24,7 @@ protected override WebRequest GetWebRequest(Uri address) {
                     BypassProxyOnLocal = false
                 };
 
-                if (Stats.EnableProxyAuthentication) {
+                if (Stats.EnableProxyAuthentication && !string.IsNullOrEmpty(Stats.ProxyUsername) && !string.IsNullOrEmpty(Stats.ProxyPassword)) {
                     webproxy.Credentials = new NetworkCredential(Stats.ProxyUsername, Stats.ProxyPassword);
                 }
 

diff --git a/Entities/ZipWebClient.cs b/Entities/ZipWebClient.cs
@@ -17,6 +17,19 @@ protected override WebRequest GetWebRequest(Uri address) {
             HttpWebRequest request = (HttpWebRequest)base.GetWebRequest(address);
             request.CachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
             request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+
+            if (Stats.UseWebProxy && Stats.SucceededTestProxy) {
+                WebProxy webproxy = new WebProxy($"{Stats.ProxyAddress}:{(!string.IsNullOrEmpty(Stats.ProxyPort) ? Stats.ProxyPort : "80")}", false) {
+                    BypassProxyOnLocal = false
+                };
+
+                if (Stats.EnableProxyAuthentication && !string.IsNullOrEmpty(Stats.ProxyUsername) && !string.IsNullOrEmpty(Stats.ProxyPassword)) {
+                    webproxy.Credentials = new NetworkCredential(Stats.ProxyUsername, Stats.ProxyPassword);
+                }
+
+                request.Proxy = webproxy;
+            }
+
             return request;
         }
     }