From: Cory Benfield <lukasaoz@gmail.com>
Date: Sat, 26 Apr 2014 12:05:01 +0000 (+0100)
Subject: Don't repopulate proxies if we don't trust the env.
X-Git-Tag: v2.3.0~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=459f8dfccb7ee2e1dc9e041b7aebc2392219c35e;p=services%2Fpython-requests.git

Don't repopulate proxies if we don't trust the env.
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 28b5da9..6b21b5d 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -218,11 +218,11 @@ class SessionRedirectMixin(object):
         """
         headers = prepared_request.headers
         url = prepared_request.url
-        new_proxies = {}
+        scheme = urlparse(url).scheme
+        new_proxies = proxies.copy() if proxies is not None else {}
 
-        if not should_bypass_proxies(url):
+        if self.trust_env and not should_bypass_proxies(url):
             environ_proxies = get_environ_proxies(url)
-            scheme = urlparse(url).scheme
 
             proxy = environ_proxies.get(scheme)