[3.3] Disable keep-alive when working with proxy (#3070)

* Disable keep-alive when working with proxy * Add changenote (cherry picked from commit 8b9924f) Co-authored-by: Andrew Svetlov <[email protected]>
aio-libs · Jun 12, 2018 · 81fd968 · 81fd968
1 parent b958df4
commit 81fd968
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES/3070.bugfix b/CHANGES/3070.bugfix
@@ -0,0 +1,2 @@
+Many HTTP proxies has buggy keepalive support.
+Let's not reuse connection but close it after processing every response.
diff --git a/aiohttp/client_proto.py b/aiohttp/client_proto.py
@@ -45,6 +45,9 @@ def should_close(self):
                 self._payload_parser is not None or
                 len(self) or self._tail)
 
+    def force_close(self):
+        self._should_close = True
+
     def close(self):
         transport = self.transport
         if transport is not None:

diff --git a/aiohttp/connector.py b/aiohttp/connector.py
@@ -895,6 +895,11 @@ async def _create_proxy_connection(self, req, traces, timeout):
         transport, proto = await self._create_direct_connection(
             proxy_req, [], timeout, client_error=ClientProxyConnectionError)
 
+        # Many HTTP proxies has buggy keepalive support.  Let's not
+        # reuse connection but close it after processing every
+        # response.
+        proto.force_close()
+
         auth = proxy_req.headers.pop(hdrs.AUTHORIZATION, None)
         if auth is not None:
             if not req.is_ssl():
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Many HTTP proxies has buggy keepalive support.
		Let's not reuse connection but close it after processing every response.