From: Andreas Røsdal <andreas.rosdal@gmail.com>
Date: Wed, 8 Mar 2017 20:29:17 +0000 (+0100)
Subject: Add parameter compression_options=None.
X-Git-Tag: v4.5.0~23^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5931f544116b2e277d1ee03fa847f52c8a3b260c;p=thirdparty%2Ftornado.git

Add parameter compression_options=None.
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 8364a8714..22584eb5b 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -520,7 +520,7 @@ class _PerMessageDeflateCompressor(object):
 
 
 class _PerMessageDeflateDecompressor(object):
-    def __init__(self, persistent, max_wbits):
+    def __init__(self, persistent, max_wbits, compression_options=None):
         if max_wbits is None:
             max_wbits = zlib.MAX_WBITS
         if not (8 <= max_wbits <= zlib.MAX_WBITS):
@@ -716,7 +716,7 @@ class WebSocketProtocol13(WebSocketProtocol):
         self._compressor = _PerMessageDeflateCompressor(
             **self._get_compressor_options(side, agreed_parameters, compression_options))
         self._decompressor = _PerMessageDeflateDecompressor(
-            **self._get_compressor_options(other_side, agreed_parameters))
+            **self._get_compressor_options(other_side, agreed_parameters, compression_options))
 
     def _write_frame(self, fin, opcode, data, flags=0):
         if fin: