#519 handle change in hostname on ReRequest

Author: justcoding121

examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

@@ -118,7 +118,7 @@ public void Stop()
 
         private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
-            string hostname = e.WebSession.Request.RequestUri.Host;
+            string hostname = e.HttpClient.Request.RequestUri.Host;
             await WriteToConsole("Tunnel to: " + hostname);
 
             if (hostname.Contains("dropbox.com"))
@@ -139,7 +139,7 @@ private Task OnBeforeTunnelConnectResponse(object sender, TunnelConnectSessionEv
         private async Task OnRequest(object sender, SessionEventArgs e)
         {
             await WriteToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
-            await WriteToConsole(e.WebSession.Request.Url);
+            await WriteToConsole(e.HttpClient.Request.Url);
 
             // store it in the UserData property
             // It can be a simple integer, Guid, or any type
@@ -191,7 +191,7 @@ private async Task OnResponse(object sender, SessionEventArgs e)
         {
             await WriteToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
 
-            string ext = System.IO.Path.GetExtension(e.WebSession.Request.RequestUri.AbsolutePath);
+            string ext = System.IO.Path.GetExtension(e.HttpClient.Request.RequestUri.AbsolutePath);
 
             //access user data set in request to do something with it
             //var userData = e.WebSession.UserData as CustomUserData;

examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs

@@ -122,7 +122,7 @@ public int ServerConnectionCount
 
         private async Task ProxyServer_BeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
-            string hostname = e.WebSession.Request.RequestUri.Host;
+            string hostname = e.HttpClient.Request.RequestUri.Host;
             if (hostname.EndsWith("webex.com"))
             {
                 e.DecryptSsl = false;
@@ -135,7 +135,7 @@ private async Task ProxyServer_BeforeTunnelConnectResponse(object sender, Tunnel
         {
             await Dispatcher.InvokeAsync(() =>
             {
-                if (sessionDictionary.TryGetValue(e.WebSession, out var item))
+                if (sessionDictionary.TryGetValue(e.HttpClient, out var item))
                 {
                     item.Update();
                 }
@@ -147,9 +147,9 @@ private async Task ProxyServer_BeforeRequest(object sender, SessionEventArgs e)
             SessionListItem item = null;
             await Dispatcher.InvokeAsync(() => { item = AddSession(e); });
 
-            if (e.WebSession.Request.HasBody)
+            if (e.HttpClient.Request.HasBody)
             {
-                e.WebSession.Request.KeepBody = true;
+                e.HttpClient.Request.KeepBody = true;
                 await e.GetRequestBody();
             }
         }
@@ -159,17 +159,17 @@ private async Task ProxyServer_BeforeResponse(object sender, SessionEventArgs e)
             SessionListItem item = null;
             await Dispatcher.InvokeAsync(() =>
             {
-                if (sessionDictionary.TryGetValue(e.WebSession, out item))
+                if (sessionDictionary.TryGetValue(e.HttpClient, out item))
                 {
                     item.Update();
                 }
             });
 
             if (item != null)
             {
-                if (e.WebSession.Response.HasBody)
+                if (e.HttpClient.Response.HasBody)
                 {
-                    e.WebSession.Response.KeepBody = true;
+                    e.HttpClient.Response.KeepBody = true;
                     await e.GetResponseBody();
 
                     await Dispatcher.InvokeAsync(() => { item.Update(); });
@@ -181,7 +181,7 @@ private async Task ProxyServer_AfterResponse(object sender, SessionEventArgs e)
         {
             await Dispatcher.InvokeAsync(() =>
             {
-                if (sessionDictionary.TryGetValue(e.WebSession, out var item))
+                if (sessionDictionary.TryGetValue(e.HttpClient, out var item))
                 {
                     item.Exception = e.Exception;
                 }
@@ -192,7 +192,7 @@ private SessionListItem AddSession(SessionEventArgsBase e)
         {
             var item = CreateSessionListItem(e);
             Sessions.Add(item);
-            sessionDictionary.Add(e.WebSession, item);
+            sessionDictionary.Add(e.HttpClient, item);
             return item;
         }
 
@@ -203,16 +203,16 @@ private SessionListItem CreateSessionListItem(SessionEventArgsBase e)
             var item = new SessionListItem
             {
                 Number = lastSessionNumber,
-                WebSession = e.WebSession,
+                WebSession = e.HttpClient,
                 IsTunnelConnect = isTunnelConnect
             };
 
-            if (isTunnelConnect || e.WebSession.Request.UpgradeToWebSocket)
+            if (isTunnelConnect || e.HttpClient.Request.UpgradeToWebSocket)
             {
                 e.DataReceived += (sender, args) =>
                 {
                     var session = (SessionEventArgs)sender;
-                    if (sessionDictionary.TryGetValue(session.WebSession, out var li))
+                    if (sessionDictionary.TryGetValue(session.HttpClient, out var li))
                     {
                         li.ReceivedDataCount += args.Count;
                     }
@@ -221,7 +221,7 @@ private SessionListItem CreateSessionListItem(SessionEventArgsBase e)
                 e.DataSent += (sender, args) =>
                 {
                     var session = (SessionEventArgs)sender;
-                    if (sessionDictionary.TryGetValue(session.WebSession, out var li))
+                    if (sessionDictionary.TryGetValue(session.HttpClient, out var li))
                     {
                         li.SentDataCount += args.Count;
                     }