Use correct key name for ACCEPT_ENCODING header

Fixes #39
miguelgrinberg · Feb 22, 2017 · f1df2e4 · f1df2e4
1 parent e1b531f
commit f1df2e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/engineio/asyncio_server.py b/engineio/asyncio_server.py
@@ -162,7 +162,7 @@ async def handle_request(self, *args, **kwargs):
         if self.http_compression and \
                 len(r['response']) >= self.compression_threshold:
             encodings = [e.split(';')[0].strip() for e in
-                         environ.get('ACCEPT_ENCODING', '').split(',')]
+                         environ.get('HTTP_ACCEPT_ENCODING', '').split(',')]
             for encoding in encodings:
                 if encoding in self.compression_methods:
                     r['response'] = \

diff --git a/engineio/server.py b/engineio/server.py
@@ -287,7 +287,7 @@ def handle_request(self, environ, start_response):
         if self.http_compression and \
                 len(r['response']) >= self.compression_threshold:
             encodings = [e.split(';')[0].strip() for e in
-                         environ.get('ACCEPT_ENCODING', '').split(',')]
+                         environ.get('HTTP_ACCEPT_ENCODING', '').split(',')]
             for encoding in encodings:
                 if encoding in self.compression_methods:
                     r['response'] = \

diff --git a/tests/test_asyncio_server.py b/tests/test_asyncio_server.py
@@ -516,7 +516,7 @@ def _gzip_decompress(b):
     def test_gzip_compression(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': 'gzip,deflate'})
+                                 'HTTP_ACCEPT_ENCODING': 'gzip,deflate'})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(compression_threshold=0)
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
@@ -531,7 +531,7 @@ def test_gzip_compression(self, import_module):
     def test_deflate_compression(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': 'deflate;q=1,gzip'})
+                                 'HTTP_ACCEPT_ENCODING': 'deflate;q=1,gzip'})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(compression_threshold=0)
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
@@ -546,7 +546,7 @@ def test_deflate_compression(self, import_module):
     def test_gzip_compression_threshold(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': 'gzip'})
+                                 'HTTP_ACCEPT_ENCODING': 'gzip'})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(compression_threshold=1000)
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
@@ -563,7 +563,7 @@ def test_gzip_compression_threshold(self, import_module):
     def test_compression_disabled(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': 'gzip'})
+                                 'HTTP_ACCEPT_ENCODING': 'gzip'})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(http_compression=False,
                                        compression_threshold=0)
@@ -581,7 +581,7 @@ def test_compression_disabled(self, import_module):
     def test_compression_unknown(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': 'rar'})
+                                 'HTTP_ACCEPT_ENCODING': 'rar'})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(compression_threshold=0)
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
@@ -598,7 +598,7 @@ def test_compression_unknown(self, import_module):
     def test_compression_no_encoding(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET',
                                  'QUERY_STRING': 'sid=foo',
-                                 'ACCEPT_ENCODING': ''})
+                                 'HTTP_ACCEPT_ENCODING': ''})
         import_module.side_effect = [a]
         s = asyncio_server.AsyncServer(compression_threshold=0)
         s.sockets['foo'] = mock_socket = self._get_mock_socket()

diff --git a/tests/test_server.py b/tests/test_server.py
@@ -629,7 +629,7 @@ def test_gzip_compression(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': 'gzip,deflate'}
+                   'HTTP_ACCEPT_ENCODING': 'gzip,deflate'}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         self.assertIn(('Content-Encoding', 'gzip'),
@@ -643,7 +643,7 @@ def test_deflate_compression(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': 'deflate;q=1,gzip'}
+                   'HTTP_ACCEPT_ENCODING': 'deflate;q=1,gzip'}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         self.assertIn(('Content-Encoding', 'deflate'),
@@ -657,7 +657,7 @@ def test_gzip_compression_threshold(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': 'gzip'}
+                   'HTTP_ACCEPT_ENCODING': 'gzip'}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         for header, value in start_response.call_args[0][1]:
@@ -671,7 +671,7 @@ def test_compression_disabled(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': 'gzip'}
+                   'HTTP_ACCEPT_ENCODING': 'gzip'}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         for header, value in start_response.call_args[0][1]:
@@ -685,7 +685,7 @@ def test_compression_unknown(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': 'rar'}
+                   'HTTP_ACCEPT_ENCODING': 'rar'}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         for header, value in start_response.call_args[0][1]:
@@ -699,7 +699,7 @@ def test_compression_no_encoding(self):
             packet.Packet(packet.MESSAGE, data='hello')])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=foo',
-                   'ACCEPT_ENCODING': ''}
+                   'HTTP_ACCEPT_ENCODING': ''}
         start_response = mock.MagicMock()
         r = s.handle_request(environ, start_response)
         for header, value in start_response.call_args[0][1]: