removed transfer-encoding header from ws aio-libs#3798

nebularazer · May 24, 2019 · d738a88 · d738a88
1 parent d73e5eb
commit d738a88
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES/3798.feature b/CHANGES/3798.feature
@@ -0,0 +1 @@
+Removed `Transfer-Encoding: chunked` header from websocket responses to be compatible with more http proxy servers.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -90,6 +90,7 @@ Eugene Naydenov
 Eugene Tolmachev
 Evert Lammerts
 FichteFoll
+Florian Scheffler
 Frederik Gladhorn
 Frederik Peter Aalund
 Gabriel Tremblay

diff --git a/aiohttp/web_response.py b/aiohttp/web_response.py
@@ -371,21 +371,31 @@ async def _start(self, request: 'BaseRequest') -> AbstractStreamWriter:
         if self._compression:
             await self._start_compression(request)
 
+        if all([
+            'websocket' == headers.get(hdrs.UPGRADE, '').lower().strip(),
+            'upgrade' == headers.get(hdrs.CONNECTION, '').lower()
+        ]):
+            websocket_response = True
+        else:
+            websocket_response = False
+
         if self._chunked:
             if version != HttpVersion11:
                 raise RuntimeError(
                     "Using chunked encoding is forbidden "
                     "for HTTP/{0.major}.{0.minor}".format(request.version))
             writer.enable_chunking()
-            headers[hdrs.TRANSFER_ENCODING] = 'chunked'
+            if websocket_response is False:
+                headers[hdrs.TRANSFER_ENCODING] = 'chunked'
             if hdrs.CONTENT_LENGTH in headers:
                 del headers[hdrs.CONTENT_LENGTH]
         elif self._length_check:
             writer.length = self.content_length
             if writer.length is None:
                 if version >= HttpVersion11:
                     writer.enable_chunking()
-                    headers[hdrs.TRANSFER_ENCODING] = 'chunked'
+                    if websocket_response is False:
+                        headers[hdrs.TRANSFER_ENCODING] = 'chunked'
                     if hdrs.CONTENT_LENGTH in headers:
                         del headers[hdrs.CONTENT_LENGTH]
                 else:

diff --git a/aiohttp/web_ws.py b/aiohttp/web_ws.py
@@ -179,7 +179,6 @@ def _handshake(self, request: BaseRequest) -> Tuple['CIMultiDict[str]',
         response_headers = CIMultiDict(  # type: ignore
             {hdrs.UPGRADE: 'websocket',
              hdrs.CONNECTION: 'upgrade',
-             hdrs.TRANSFER_ENCODING: 'chunked',
              hdrs.SEC_WEBSOCKET_ACCEPT: accept_val})
 
         notakeover = False