From: Bryce Boe <bbzbryce@gmail.com>
Date: Tue, 18 Dec 2012 01:13:18 +0000 (-0800)
Subject: Fix issue 1027. Always persist cookies.
X-Git-Tag: v1.0.3~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e355d6ac6cbc8278ec5935986216e32541b80dd1;p=services%2Fpython-requests.git

Fix issue 1027. Always persist cookies.
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 8ea1e27..9aa8c13 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -71,10 +71,6 @@ class SessionRedirectMixin(object):
         # ((resp.status_code is codes.see_other))
         while (('location' in resp.headers and resp.status_code in REDIRECT_STATI)):
 
-            # Persist cookies.
-            for cookie in resp.cookies:
-                self.cookies.set_cookie(cookie)
-
             resp.content  # Consume socket so it can be released
 
             if i >= self.max_redirects:
@@ -265,6 +261,10 @@ class Session(SessionRedirectMixin):
         # Send the request.
         resp = self.send(prep, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies)
 
+        # Persist cookies.
+        for cookie in resp.cookies:
+            self.cookies.set_cookie(cookie)
+
         # Redirect resolving generator.
         gen = self.resolve_redirects(resp, req, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies)