hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-28 11:09:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "TUN-5184: Make sure outstanding websocket write is finished, and no more writes after shutdown"

Browse Source 
This reverts commit f8fbbcd806.
This commit is contained in:
Nuno Diegues
2021-10-25 19:51:52 +01:00
parent f6f10305a6
commit 573d410606
6 changed files with 52 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connection/quic_test.go
View File

@@ -61,7 +61,7 @@ func TestQUICServer(t *testing.T) {
// This is simply a sample websocket frame message.
wsBuf := &bytes.Buffer{}
wsutil.WriteClientBinary(wsBuf, []byte("Hello"))
wsutil.WriteClientText(wsBuf, []byte("Hello"))
var tests = []struct {
desc string
@@ -118,7 +118,7 @@ func TestQUICServer(t *testing.T) {
},
{
desc: "test ws proxy",
dest: "/ws/echo",
dest: "/ok",
connectionType: quicpogs.ConnectionTypeWebsocket,
metadata: []quicpogs.Metadata{
quicpogs.Metadata{
@@ -139,7 +139,7 @@ func TestQUICServer(t *testing.T) {
},
},
message: wsBuf.Bytes(),
expectedResponse: []byte{0x82, 0x5, 0x48, 0x65, 0x6c, 0x6c, 0x6f},
expectedResponse: []byte{0x81, 0x5, 0x48, 0x65, 0x6c, 0x6c, 0x6f},
},
{
desc: "test tcp proxy",
@@ -278,7 +278,7 @@ func (moc *mockOriginProxyWithRequest) ProxyHTTP(w ResponseWriter, r *http.Reque
}
if isWebsocket {
return wsEchoEndpoint(w, r)
return wsEndpoint(w, r)
}
switch r.URL.Path {
case "/ok":