diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-23 23:06:39 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-23 23:06:39 (GMT) |
| commit | f9284ae8ede5b8977248a4259eee0cd81a100c16 (patch) | |
| tree | b3430fd55e6b76ee01dfd6ac4a0baa52de7b7a3a /Lib/http | |
| parent | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c (diff) | |
| parent | 7243b574e5fc6f9ae68dc5ebd8252047b8e78e3b (diff) | |
| download | cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.zip cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.tar.gz cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.tar.bz2 | |
merge 3.4 (#22921)
Diffstat (limited to 'Lib/http')
| -rw-r--r-- | Lib/http/client.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index 0a58fcb..31d066b 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -1288,10 +1288,9 @@ else: server_hostname = self._tunnel_host else: server_hostname = self.host - sni_hostname = server_hostname if ssl.HAS_SNI else None self.sock = self._context.wrap_socket(self.sock, - server_hostname=sni_hostname) + server_hostname=server_hostname) if not self._context.check_hostname and self._check_hostname: try: ssl.match_hostname(self.sock.getpeercert(), server_hostname) |