From: Roman Haritonov <reclosedev@gmail.com>
Date: Fri, 19 Apr 2013 06:13:36 +0000 (+0400)
Subject: Don't reuse PreparedRequest on redirects
X-Git-Tag: 2.0~19^2~9^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=716b627c1e7c86af722affe973a11df4d5812a1b;p=services%2Fpython-requests.git

Don't reuse PreparedRequest on redirects
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 634637f..6d1000d 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -71,15 +71,13 @@ class SessionRedirectMixin(object):
         """Receives a Response. Returns a generator of Responses."""
 
         i = 0
-        prepared_request = PreparedRequest()
-        prepared_request.body = req.body
-        prepared_request.headers = req.headers.copy()
-        prepared_request.hooks = req.hooks
-        prepared_request.method = req.method
-        prepared_request.url = req.url
 
         # ((resp.status_code is codes.see_other))
         while (('location' in resp.headers and resp.status_code in REDIRECT_STATI)):
+            prepared_request = PreparedRequest()
+            prepared_request.body = req.body
+            prepared_request.headers = req.headers.copy()
+            prepared_request.hooks = req.hooks
 
             resp.content  # Consume socket so it can be released
 
@@ -90,7 +88,7 @@ class SessionRedirectMixin(object):
             resp.close()
 
             url = resp.headers['location']
-            method = prepared_request.method
+            method = req.method
 
             # Handle redirection without scheme (see: RFC 1808 Section 4)
             if url.startswith('//'):
@@ -114,12 +112,12 @@ class SessionRedirectMixin(object):
 
             # http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.4
             if (resp.status_code == codes.see_other and
-                    prepared_request.method != 'HEAD'):
+                    method != 'HEAD'):
                 method = 'GET'
 
             # Do what the browsers do, despite standards...
             if (resp.status_code in (codes.moved, codes.found) and
-                    prepared_request.method not in ('GET', 'HEAD')):
+                    method not in ('GET', 'HEAD')):
                 method = 'GET'
 
             prepared_request.method = method
diff --git a/test_requests.py b/test_requests.py
index fed70d8..7ad10ee 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -169,7 +169,6 @@ class RequestsTestCase(unittest.TestCase):
             }
         )
         assert 'foo' not in s.cookies
-<<<<<<< HEAD
 
     def test_request_cookie_overrides_session_cookie(self):
         s = requests.session()