From a8ceb68b63ed3a0b610cafead092dd3b75d1ce9a Mon Sep 17 00:00:00 2001 From: titanium007 Date: Tue, 22 Mar 2016 00:28:35 -0400 Subject: [PATCH] lock host set --- Titanium.Web.Proxy/Network/HttpWebClient.cs | 2 +- Titanium.Web.Proxy/RequestHandler.cs | 7 +++---- Titanium.Web.Proxy/ResponseHandler.cs | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Titanium.Web.Proxy/Network/HttpWebClient.cs b/Titanium.Web.Proxy/Network/HttpWebClient.cs index 361342abc..7963732e3 100644 --- a/Titanium.Web.Proxy/Network/HttpWebClient.cs +++ b/Titanium.Web.Proxy/Network/HttpWebClient.cs @@ -20,7 +20,7 @@ public class Request public Uri RequestUri { get; set; } public string HttpVersion { get; set; } - public string Host + internal string Host { get { diff --git a/Titanium.Web.Proxy/RequestHandler.cs b/Titanium.Web.Proxy/RequestHandler.cs index ee24a9b9f..c2bc58286 100644 --- a/Titanium.Web.Proxy/RequestHandler.cs +++ b/Titanium.Web.Proxy/RequestHandler.cs @@ -237,7 +237,6 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S args.Client.ClientStream = clientStream; args.Client.ClientStreamReader = clientStreamReader; args.Client.ClientStreamWriter = clientStreamWriter; - args.ProxySession.Request.Host = args.ProxySession.Request.RequestUri.Host; //If requested interception if (BeforeRequest != null) @@ -257,11 +256,11 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S //construct the web request that we are going to issue on behalf of the client. connection = connection == null ? TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps) - : lastRequestHostName != args.ProxySession.Request.Host ? TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps) + : lastRequestHostName != args.ProxySession.Request.RequestUri.Host ? TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps) : connection; - lastRequestHostName = args.ProxySession.Request.Host; - + lastRequestHostName = args.ProxySession.Request.RequestUri.Host; + args.ProxySession.Request.Host = args.ProxySession.Request.RequestUri.Host; args.ProxySession.SetConnection(connection); args.ProxySession.SendRequest(); diff --git a/Titanium.Web.Proxy/ResponseHandler.cs b/Titanium.Web.Proxy/ResponseHandler.cs index 84d201bb0..0b5d20776 100644 --- a/Titanium.Web.Proxy/ResponseHandler.cs +++ b/Titanium.Web.Proxy/ResponseHandler.cs @@ -84,8 +84,6 @@ public static void HandleHttpSessionResponse(SessionEventArgs args) } - - private static void WriteResponseStatus(string version, string code, string description, StreamWriter responseWriter) {