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
f3528b77
Unverified
Commit
f3528b77
authored
Dec 27, 2019
by
honfika
Committed by
GitHub
Dec 27, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #725 from justcoding121/master
fix
parents
746f8d6d
66a45c02
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
TcpConnectionFactory.cs
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
+5
-0
RequestHandler.cs
src/Titanium.Web.Proxy/RequestHandler.cs
+15
-1
No files found.
src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
View file @
f3528b77
...
...
@@ -302,6 +302,11 @@ namespace Titanium.Web.Proxy.Network.Tcp
}
}
if
(
isHttps
&&
sslProtocol
==
SslProtocols
.
None
)
{
sslProtocol
=
proxyServer
.
SupportedSslProtocols
;
}
bool
useUpstreamProxy1
=
false
;
// check if external proxy is set for HTTP/HTTPS
...
...
src/Titanium.Web.Proxy/RequestHandler.cs
View file @
f3528b77
...
...
@@ -68,7 +68,10 @@ namespace Titanium.Web.Proxy
UserData
=
connectArgs
?.
UserData
};
args
.
HttpClient
.
Request
.
IsHttps
=
isHttps
;
if
(
isHttps
)
{
args
.
HttpClient
.
Request
.
IsHttps
=
true
;
}
try
{
...
...
@@ -156,7 +159,18 @@ namespace Titanium.Web.Proxy
}
prefetchTask
=
null
;
}
if
(
connection
!=
null
)
{
var
socket
=
connection
.
TcpSocket
;
bool
part1
=
socket
.
Poll
(
1000
,
SelectMode
.
SelectRead
);
bool
part2
=
socket
.
Available
==
0
;
if
(
part1
&
part2
)
{
//connection is closed
connection
=
null
;
}
}
// create a new connection if cache key changes.
...
...
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