Unverified Commit ad784227 authored by honfika's avatar honfika Committed by GitHub

Merge pull request #397 from justcoding121/develop

merge to beta
parents a007c1c0 fce1aa51
......@@ -316,7 +316,7 @@ namespace Titanium.Web.Proxy
bool isHttp = (protocolType & ProxyProtocolType.Http) > 0;
bool isHttps = (protocolType & ProxyProtocolType.Https) > 0;
if (isHttps)
{
if (!endPoint.EnableSsl)
......
......@@ -97,7 +97,12 @@ namespace Titanium.Web.Proxy
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)
{
......
......@@ -28,6 +28,7 @@ namespace Titanium.Web.Proxy
await args.WebSession.ReceiveResponse();
var response = args.WebSession.Response;
args.ReRequest = false;
//check for windows authentication
if (isWindowsAuthenticationEnabledAndSupported && response.StatusCode == (int)HttpStatusCode.Unauthorized)
......@@ -35,7 +36,7 @@ namespace Titanium.Web.Proxy
await Handle401UnAuthorized(args);
}
args.ReRequest = false;
response.OriginalHasBody = response.HasBody;
//if user requested call back then do it
if (!response.Locked)
......
......@@ -130,12 +130,8 @@ namespace Titanium.Web.Proxy
//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;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment