Call https website through proxy will cause error #1745

CHANGES.rst

@@ -2,6 +2,12 @@ Changes
 =======
 
 
+2.0.3 (2017-03-24)
+------------------
+
+- Call https website through proxy will cause error #1745
+
+
 2.0.2 (2017-03-21)
 ------------------
 

aiohttp/client_reqrep.py

@@ -563,8 +563,10 @@ def _response_eof(self):
             return
 
         if self._connection is not None:
-            # websocket
-            if self._connection.protocol.upgraded:
+            # websocket, protocol could be None because
+            # connection could be detached
+            if (self._connection.protocol is not None and
+                    self._connection.protocol.upgraded):
                 return
 
             self._connection.release()

tests/test_client_response.py

@@ -172,6 +172,19 @@ def test_response_eof_upgraded(loop):
     assert response._connection is conn
 
 
+@asyncio.coroutine
+def test_response_eof_after_connection_detach(loop):
+    response = ClientResponse('get', URL('http://def-cl-resp.org'))
+    response._post_init(loop)
+    response._closed = False
+    conn = response._connection = mock.Mock()
+    conn.protocol = None
+
+    response._response_eof()
+    assert conn.release.called
+    assert response._connection is None
+
+
 @asyncio.coroutine
 def test_text(loop):
     response = ClientResponse('get', URL('http://def-cl-resp.org'))