Skip to content

Commit 6411d91

Browse files
abursavichnhooyr
authored andcommitted
Remove x-webkit-deflate-frame dead code
1 parent d7227c2 commit 6411d91

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

Diff for: accept_test.go

-16
Original file line numberDiff line numberDiff line change
@@ -419,22 +419,6 @@ func Test_selectDeflate(t *testing.T) {
419419
},
420420
expOK: true,
421421
},
422-
// {
423-
// name: "x-webkit-deflate-frame",
424-
// mode: CompressionNoContextTakeover,
425-
// reqSecWebSocketExtensions: "x-webkit-deflate-frame; no_context_takeover",
426-
// respSecWebSocketExtensions: "x-webkit-deflate-frame; no_context_takeover",
427-
// expCopts: &compressionOptions{
428-
// clientNoContextTakeover: true,
429-
// serverNoContextTakeover: true,
430-
// },
431-
// },
432-
// {
433-
// name: "x-webkit-deflate/error",
434-
// mode: CompressionNoContextTakeover,
435-
// reqSecWebSocketExtensions: "x-webkit-deflate-frame; max_window_bits",
436-
// error: true,
437-
// },
438422
}
439423

440424
for _, tc := range testCases {

Diff for: compress.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ import (
1212
// CompressionMode represents the modes available to the deflate extension.
1313
// See https://tools.ietf.org/html/rfc7692
1414
//
15-
// A compatibility layer is implemented for the older deflate-frame extension used
16-
// by safari. See https://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-06
17-
// It will work the same in every way except that we cannot signal to the peer we
18-
// want to use no context takeover on our side, we can only signal that they should.
19-
// But it is currently disabled due to Safari bugs. See https://github.com/nhooyr/websocket/issues/218
15+
// Works in all browsers except Safari which does not implement the deflate extension.
2016
type CompressionMode int
2117

2218
const (

Diff for: ws_js.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,7 @@ func CloseStatus(err error) StatusCode {
485485

486486
// CompressionMode represents the modes available to the deflate extension.
487487
// See https://tools.ietf.org/html/rfc7692
488-
//
489-
// A compatibility layer is implemented for the older deflate-frame extension used
490-
// by safari. See https://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-06
491-
// It will work the same in every way except that we cannot signal to the peer we
492-
// want to use no context takeover on our side, we can only signal that they should.
493-
// It is however currently disabled due to Safari bugs. See https://github.com/nhooyr/websocket/issues/218
488+
// Works in all browsers except Safari which does not implement the deflate extension.
494489
type CompressionMode int
495490

496491
const (

0 commit comments

Comments
 (0)