Merge pull request #726 from justcoding121/master

beta
justcoding121 · Dec 28, 2019 · fce77d7 · fce77d7
2 parents f3528b7 + 27791e0
commit fce77d7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -42,6 +42,11 @@ public ProxyTestController()
                     await writeToConsole(exception.Message, ConsoleColor.Red);
                 }
             };
+
+            proxyServer.TcpTimeWaitSeconds = 10;
+            proxyServer.ConnectionTimeOutSeconds = 15;
+            proxyServer.ReuseSocket = false;
+            proxyServer.EnableConnectionPool = false;
             proxyServer.ForwardToUpstreamGateway = true;
             proxyServer.CertificateManager.SaveFakeCertificates = true;
             //proxyServer.ProxyBasicAuthenticateFunc = async (args, userName, password) =>

diff --git a/src/Titanium.Web.Proxy/Helpers/HttpStream.cs b/src/Titanium.Web.Proxy/Helpers/HttpStream.cs
@@ -1096,7 +1096,12 @@ private async Task copyBodyChunkedAsync(IHttpStreamWriter writer, Action<byte[],
         {
             while (true)
             {
-                string chunkHead = (await ReadLineAsync(cancellationToken))!;
+                string? chunkHead = await ReadLineAsync(cancellationToken);
+                if (chunkHead == null)
+                {
+                    return;
+                }
+
                 int idx = chunkHead.IndexOf(";");
                 if (idx >= 0)
                 {

diff --git a/src/Titanium.Web.Proxy/RequestHandler.cs b/src/Titanium.Web.Proxy/RequestHandler.cs
@@ -169,6 +169,7 @@ await HeaderParser.ReadHeaders(clientStream, args.HttpClient.Request.Headers,
                                 if (part1 & part2)
                                 {
                                     //connection is closed
+                                    await tcpConnectionFactory.Release(connection, true);
                                     connection = null;
                                 }
                             }
@@ -297,7 +298,11 @@ private async Task<RetryResult> handleHttpSessionRequest(SessionEventArgs args,
 
                 if (args.HttpClient.Request.UpgradeToWebSocket)
                 {
-                    args.HttpClient.ConnectRequest!.TunnelType = TunnelType.Websocket;
+                    // connectRequest can be null for SOCKS connection
+                    if (args.HttpClient.ConnectRequest != null)
+                    {
+                        args.HttpClient.ConnectRequest!.TunnelType = TunnelType.Websocket;
+                    }
 
                     // if upgrading to websocket then relay the request without reading the contents
                     await handleWebSocketUpgrade(args, args.ClientStream, connection, cancellationTokenSource, cancellationToken);