Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
f3166177
Unverified
Commit
f3166177
authored
Sep 28, 2018
by
Jehonathan Thomas
Committed by
GitHub
Sep 28, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #497 from justcoding121/master
check session for null
parents
08167b4d
bf983616
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
3 deletions
+14
-3
TcpConnectionFactory.cs
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
+14
-3
No files found.
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
View file @
f3166177
...
@@ -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
}
"
);
}
}
session
.
TimeLine
[
"Dns Resolved"
]
=
DateTime
.
Now
;
if
(
session
!=
null
)
{
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
}
}
}
}
session
.
TimeLine
[
"Connection Established"
]
=
DateTime
.
Now
;
if
(
session
!=
null
)
{
session
.
TimeLine
[
"Connection Established"
]
=
DateTime
.
Now
;
}
await
proxyServer
.
InvokeConnectionCreateEvent
(
tcpClient
,
false
);
await
proxyServer
.
InvokeConnectionCreateEvent
(
tcpClient
,
false
);
...
@@ -370,7 +376,12 @@ namespace Titanium.Web.Proxy.Network.Tcp
...
@@ -370,7 +376,12 @@ namespace Titanium.Web.Proxy.Network.Tcp
#if NETCOREAPP2_1
#if NETCOREAPP2_1
negotiatedApplicationProtocol
=
sslStream
.
NegotiatedApplicationProtocol
;
negotiatedApplicationProtocol
=
sslStream
.
NegotiatedApplicationProtocol
;
#endif
#endif
session
.
TimeLine
[
"HTTPS Established"
]
=
DateTime
.
Now
;
if
(
session
!=
null
)
{
session
.
TimeLine
[
"HTTPS Established"
]
=
DateTime
.
Now
;
}
}
}
}
}
catch
(
Exception
)
catch
(
Exception
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment