summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-04-25 16:17:54 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-04-25 16:17:54 (GMT)
commitb31c87bfcfc8b904ef05d998b4c38122b8651763 (patch)
treec22210fcdb922ddac35eb73f8abc4dcf8f5f5bb8 /Doc
parentd4442ae53aa88a410e916b289ceb778ca6a8315f (diff)
downloadcpython-b31c87bfcfc8b904ef05d998b4c38122b8651763.zip
cpython-b31c87bfcfc8b904ef05d998b4c38122b8651763.tar.gz
cpython-b31c87bfcfc8b904ef05d998b4c38122b8651763.tar.bz2
backport fix for Issue #26804.
urllib.request will prefer lower_case proxy environment variables over UPPER_CASE or Mixed_Case ones.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urllib.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 91deb39..4c34b90 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -292,6 +292,8 @@ Utility functions
in case insensitive way, for all operating systems first, and when it cannot
find it, looks for proxy information from Mac OSX System Configuration for
Mac OS X and Windows Systems Registry for Windows.
+ If both lowercase and uppercase environment variables exist (and disagree),
+ lowercase is preferred.
.. note::
urllib also exposes certain utility functions like splittype, splithost and