Merge pull request #397 from justcoding121/develop

merge to beta

Author: honfika

Titanium.Web.Proxy/ProxyServer.cs

@@ -316,7 +316,7 @@ public void SetAsSystemProxy(ExplicitProxyEndPoint endPoint, ProxyProtocolType p
 
             bool isHttp = (protocolType & ProxyProtocolType.Http) > 0;
             bool isHttps = (protocolType & ProxyProtocolType.Https) > 0;
-
+            
             if (isHttps)
             {
                 if (!endPoint.EnableSsl)

Titanium.Web.Proxy/RequestHandler.cs

@@ -97,7 +97,12 @@ private async Task HandleClient(ExplicitProxyEndPoint endPoint, TcpClient tcpCli
 
                     await clientStreamWriter.WriteResponseAsync(response);
 
-                    var clientHelloInfo = await SslTools.PeekClientHello(clientStream);
+                    ClientHelloInfo clientHelloInfo = null;
+                    if (endPoint.EnableSsl)
+                    {
+                        clientHelloInfo = await SslTools.PeekClientHello(clientStream);
+                    }
+
                     bool isClientHello = clientHelloInfo != null;
                     if (isClientHello)
                     {

Titanium.Web.Proxy/ResponseHandler.cs

@@ -28,14 +28,15 @@ private async Task HandleHttpSessionResponse(SessionEventArgs args)
                 await args.WebSession.ReceiveResponse();
 
                 var response = args.WebSession.Response;
+                args.ReRequest = false;
 
                 //check for windows authentication
                 if (isWindowsAuthenticationEnabledAndSupported && response.StatusCode == (int)HttpStatusCode.Unauthorized)
                 {
                     await Handle401UnAuthorized(args);
                 }
 
-                args.ReRequest = false;
+                response.OriginalHasBody = response.HasBody;
 
                 //if user requested call back then do it
                 if (!response.Locked)

Titanium.Web.Proxy/WinAuthHandler.cs

@@ -130,12 +130,8 @@ internal async Task Handle401UnAuthorized(SessionEventArgs args)
                 //Should we cache all Set-Cokiee headers from server during auth process
                 //and send it to client after auth?
 
-                //clear current server response
-                await args.ClearResponse();
-
-                //request again with updated authorization header
-                //and server cookies
-                await HandleHttpSessionRequestInternal(args.WebSession.ServerConnection, args);
+                // Let ResponseHandler send the updated request
+                args.ReRequest = true;
             }
         }
     }