diff options
| author | Philip Thiem <ptthiem@gmail.com> | 2013-09-28 12:33:19 -0500 |
|---|---|---|
| committer | Philip Thiem <ptthiem@gmail.com> | 2013-09-28 12:33:19 -0500 |
| commit | 78f01306a08285e9f2abe6ad749f6ce884e12555 (patch) | |
| tree | c4769869539d5ae9101a7e8e76a46e9e292b9b97 /setuptools/ssl_support.py | |
| parent | 30bb58f069cf1624f35cfbdb725e8e443ff64330 (diff) | |
| parent | 49ce80613b7fcffd1882f7fb082e5bcc30e976f0 (diff) | |
| download | python-setuptools-git-78f01306a08285e9f2abe6ad749f6ce884e12555.tar.gz | |
Merge with default
--HG--
extra : rebase_source : d9c70d5bebd4290f568c828c5bc3a9b93a817ff2
Diffstat (limited to 'setuptools/ssl_support.py')
| -rw-r--r-- | setuptools/ssl_support.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index f8a780a9..90359b2c 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -194,6 +194,12 @@ class VerifyingHTTPSConn(HTTPSConnection): sock = create_connection( (self.host, self.port), getattr(self,'source_address',None) ) + + # Handle the socket if a (proxy) tunnel is present + if hasattr(self, '_tunnel') and getattr(self, '_tunnel_host', None): + self.sock = sock + self._tunnel() + self.sock = ssl.wrap_socket( sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle ) |