Merge pull request #55 from justcoding121/master

lock host set
justcoding121 · Mar 22, 2016 · ab92537 · ab92537
2 parents c625408 + a8ceb68
commit ab92537
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -84,8 +84,6 @@ public static void HandleHttpSessionResponse(SessionEventArgs args)
         }
 
 
-
-
         private static void WriteResponseStatus(string version, string code, string description,
             StreamWriter responseWriter)
         {
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             private static void WriteResponseStatus(string version, string code, string description,
                 StreamWriter responseWriter)
             {
@@ Expand Down @@