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
5a4f1af9
Commit
5a4f1af9
authored
Apr 05, 2020
by
Honfika
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WebSocket fix
parent
fa449db1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
ProxyTestController.cs
.../Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
+0
-1
SessionEventArgs.cs
src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
+9
-2
WebSocketDecoder.cs
src/Titanium.Web.Proxy/WebSocket/WebSocketDecoder.cs
+13
-1
No files found.
examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
View file @
5a4f1af9
...
...
@@ -430,4 +430,3 @@ namespace Titanium.Web.Proxy.Examples.Basic
//}
}
}
src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
View file @
5a4f1af9
...
...
@@ -25,7 +25,9 @@ namespace Titanium.Web.Proxy.EventArguments
/// </summary>
private
bool
reRequest
;
private
WebSocketDecoder
?
webSocketDecoder
;
private
WebSocketDecoder
?
webSocketDecoderSend
;
private
WebSocketDecoder
?
webSocketDecoderReceive
;
/// <summary>
/// Is this session a HTTP/2 promise?
...
...
@@ -59,7 +61,12 @@ namespace Titanium.Web.Proxy.EventArguments
}
}
public
WebSocketDecoder
WebSocketDecoder
=>
webSocketDecoder
??=
new
WebSocketDecoder
(
BufferPool
);
[
Obsolete
(
"Use [WebSocketDecoderReceive] instead"
)]
public
WebSocketDecoder
WebSocketDecoder
=>
WebSocketDecoderReceive
;
public
WebSocketDecoder
WebSocketDecoderSend
=>
webSocketDecoderSend
??=
new
WebSocketDecoder
(
BufferPool
);
public
WebSocketDecoder
WebSocketDecoderReceive
=>
webSocketDecoderReceive
??=
new
WebSocketDecoder
(
BufferPool
);
/// <summary>
/// Occurs when multipart request part sent.
...
...
src/Titanium.Web.Proxy/WebSocket/WebSocketDecoder.cs
View file @
5a4f1af9
...
...
@@ -100,7 +100,6 @@ namespace Titanium.Web.Proxy
{
data1
[
pos
+
2
]
^=
(
byte
)(
mask
>>
16
);
}
;
}
}
...
...
@@ -115,6 +114,19 @@ namespace Titanium.Web.Proxy
{
copyToBuffer
(
buffer
);
}
if
(
copied
)
{
if
(
buffer
.
Length
==
0
)
{
bufferLength
=
0
;
}
else
{
buffer
.
CopyTo
(
this
.
buffer
);
bufferLength
=
buffer
.
Length
;
}
}
}
private
Memory
<
byte
>
copyToBuffer
(
ReadOnlyMemory
<
byte
>
data
)
...
...
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