From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 26 Sep 2011 02:59:20 +0000 (-0400)
Subject: urllib3 update
X-Git-Tag: v0.8.0~94^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cff3b7f9bd96b6837914ebb0fcf79ba874569ca5;p=services%2Fpython-requests.git

urllib3 update
---

diff --git a/requests/packages/urllib3/connectionpool.py b/requests/packages/urllib3/connectionpool.py
index 95e3dd4..add6fbc 100644
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
@@ -284,6 +284,7 @@ class HTTPConnectionPool(ConnectionPool):
             httplib_response = self._make_request(conn, method, url,
                                                   timeout=timeout,
                                                   body=body, headers=headers)
+
             # Import httplib's response into our own wrapper object
             response = HTTPResponse.from_httplib(httplib_response,
                                                  pool=self,
@@ -309,7 +310,8 @@ class HTTPConnectionPool(ConnectionPool):
         finally:
             if release_conn:
                 # Put the connection back to be reused
-                self._put_conn(conn)
+                response.release_conn() # Equivalent to self._put_conn(conn) but
+                                        # tracks release state.
 
         if not conn:
             log.warn("Retrying (%d attempts remain) after connection "