From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 14 Jul 2010 19:28:35 +0000 (+0000)
Subject: Merged revisions 82892 via svnmerge from
X-Git-Tag: v2.6.6rc1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a4e8379437017ada5d0e8e74c752cc6c4b5030f;p=python

Merged revisions 82892 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82892 | senthil.kumaran | 2010-07-15 00:55:26 +0530 (Thu, 15 Jul 2010) | 9 lines

  Merged revisions 82890 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82890 | senthil.kumaran | 2010-07-15 00:45:23 +0530 (Thu, 15 Jul 2010) | 3 lines

    Fix: Issue6853 - Get HTTPS system proxy in Windows.
  ........
................
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index da4f56ed89..d5d576011e 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1448,6 +1448,7 @@ elif os.name == 'nt':
                         proxies['http'] = proxyServer
                     else:
                         proxies['http'] = 'http://%s' % proxyServer
+                        proxies['https'] = 'http://%s' % proxyServer
                         proxies['ftp'] = 'ftp://%s' % proxyServer
             internetSettings.Close()
         except (WindowsError, ValueError, TypeError):