Unverified Commit f3166177 authored by Jehonathan Thomas's avatar Jehonathan Thomas Committed by GitHub

Merge pull request #497 from justcoding121/master

check session for null
parents 08167b4d bf983616
...@@ -293,7 +293,10 @@ namespace Titanium.Web.Proxy.Network.Tcp ...@@ -293,7 +293,10 @@ namespace Titanium.Web.Proxy.Network.Tcp
throw new Exception($"Could not resolve the hostname {hostname}"); throw new Exception($"Could not resolve the hostname {hostname}");
} }
if (session != null)
{
session.TimeLine["Dns Resolved"] = DateTime.Now; session.TimeLine["Dns Resolved"] = DateTime.Now;
}
var ipAddresses = ipHostEntry.AddressList; var ipAddresses = ipHostEntry.AddressList;
...@@ -313,7 +316,10 @@ namespace Titanium.Web.Proxy.Network.Tcp ...@@ -313,7 +316,10 @@ namespace Titanium.Web.Proxy.Network.Tcp
} }
} }
if (session != null)
{
session.TimeLine["Connection Established"] = DateTime.Now; session.TimeLine["Connection Established"] = DateTime.Now;
}
await proxyServer.InvokeConnectionCreateEvent(tcpClient, false); await proxyServer.InvokeConnectionCreateEvent(tcpClient, false);
...@@ -370,8 +376,13 @@ namespace Titanium.Web.Proxy.Network.Tcp ...@@ -370,8 +376,13 @@ namespace Titanium.Web.Proxy.Network.Tcp
#if NETCOREAPP2_1 #if NETCOREAPP2_1
negotiatedApplicationProtocol = sslStream.NegotiatedApplicationProtocol; negotiatedApplicationProtocol = sslStream.NegotiatedApplicationProtocol;
#endif #endif
if (session != null)
{
session.TimeLine["HTTPS Established"] = DateTime.Now; session.TimeLine["HTTPS Established"] = DateTime.Now;
} }
}
} }
catch (Exception) catch (Exception)
{ {
......
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