Do not swallow Upgrade header #1587

aio-libs · Feb 6, 2017 · d175e4e · d175e4e
1 parent 964921d
commit d175e4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,8 @@ CHANGES
 
 - Separate read + connect + request timeouts # 1523
 
+- Do not swallow Upgrade header #1587
+
 - Fix polls demo run application #1487
 
 - Ignore unknown 1XX status codes in client #1353

diff --git a/aiohttp/protocol.py b/aiohttp/protocol.py
@@ -641,7 +641,7 @@ def add_header(self, name, value):
         elif name == hdrs.UPGRADE:
             if 'websocket' in value.lower():
                 self.websocket = True
-                self.headers[name] = value
+            self.headers[name] = value
 
         elif name not in self.HOP_HEADERS:
             # ignore hop-by-hop headers

diff --git a/tests/test_protocol.py b/tests/test_protocol.py
@@ -147,11 +147,13 @@ def test_add_headers_upgrade(transport):
 
 def test_add_headers_upgrade_websocket(transport):
     msg = protocol.Response(transport, 200)
-
     msg.add_headers(('upgrade', 'test'))
-    assert [] == list(msg.headers)
+    assert not msg.websocket
+    assert [('Upgrade', 'test')] == list(msg.headers.items())
 
+    msg = protocol.Response(transport, 200)
     msg.add_headers(('upgrade', 'websocket'))
+    assert msg.websocket
     assert [('Upgrade', 'websocket')] == list(msg.headers.items())