Merge pull request #725 from justcoding121/master

fix
justcoding121 · Dec 27, 2019 · f3528b7 · f3528b7
2 parents 746f8d6 + 66a45c0
commit f3528b7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
@@ -302,6 +302,11 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                 }
             }
 
+            if (isHttps && sslProtocol == SslProtocols.None)
+            {
+                sslProtocol = proxyServer.SupportedSslProtocols;
+            }
+
             bool useUpstreamProxy1 = false;
 
             // check if external proxy is set for HTTP/HTTPS

diff --git a/src/Titanium.Web.Proxy/RequestHandler.cs b/src/Titanium.Web.Proxy/RequestHandler.cs
@@ -68,7 +68,10 @@ private async Task handleHttpSessionRequest(ProxyEndPoint endPoint, HttpClientSt
                         UserData = connectArgs?.UserData
                     };
 
-                    args.HttpClient.Request.IsHttps = isHttps;
+                    if (isHttps)
+                    {
+                        args.HttpClient.Request.IsHttps = true;
+                    }
 
                     try
                     {
@@ -156,7 +159,18 @@ await HeaderParser.ReadHeaders(clientStream, args.HttpClient.Request.Headers,
                                 }
 
                                 prefetchTask = null;
+                            }
 
+                            if (connection != null)
+                            {
+                                var socket = connection.TcpSocket;
+                                bool part1 = socket.Poll(1000, SelectMode.SelectRead);
+                                bool part2 = socket.Available == 0;
+                                if (part1 & part2)
+                                {
+                                    //connection is closed
+                                    connection = null;
+                                }
                             }
 
                             // create a new connection if cache key changes.