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
ed1c6ba3
Commit
ed1c6ba3
authored
Jun 16, 2017
by
justcoding121
Committed by
justcoding121
Jun 16, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #269 from kasajian/develop
On CancelRequest, bypass connection
parents
7e4c20f8
e7f785da
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
RequestHandler.cs
Titanium.Web.Proxy/RequestHandler.cs
+2
-2
No files found.
Titanium.Web.Proxy/RequestHandler.cs
View file @
ed1c6ba3
...
@@ -340,7 +340,7 @@ namespace Titanium.Web.Proxy
...
@@ -340,7 +340,7 @@ namespace Titanium.Web.Proxy
}
}
//if upgrading to websocket then relay the requet without reading the contents
//if upgrading to websocket then relay the requet without reading the contents
if
(
args
.
WebSession
.
Request
.
UpgradeToWebSocket
)
if
(
!
args
.
WebSession
.
Request
.
CancelRequest
&&
args
.
WebSession
.
Request
.
UpgradeToWebSocket
)
{
{
await
TcpHelper
.
SendRaw
(
this
,
await
TcpHelper
.
SendRaw
(
this
,
httpRemoteUri
.
Host
,
httpRemoteUri
.
Port
,
httpRemoteUri
.
Host
,
httpRemoteUri
.
Port
,
...
@@ -351,7 +351,7 @@ namespace Titanium.Web.Proxy
...
@@ -351,7 +351,7 @@ namespace Titanium.Web.Proxy
break
;
break
;
}
}
if
(
connection
==
null
)
if
(
!
args
.
WebSession
.
Request
.
CancelRequest
&&
connection
==
null
)
{
{
connection
=
await
GetServerConnection
(
args
);
connection
=
await
GetServerConnection
(
args
);
}
}
...
...
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