diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-11-03 19:36:48 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-11-03 19:36:48 (GMT) |
commit | 1cca273669598978f6dfc1d1aad92e02a84bbe04 (patch) | |
tree | 1f691e61f1dcc13f14fee02fe0031dd865e74869 /Lib/http | |
parent | 2cb0e73a89589ce56ba17da39a06f8017cfc92e4 (diff) | |
parent | 4ffb0752710f0c0720d4f2af0c4b7ce1ebb9d2bd (diff) | |
download | cpython-1cca273669598978f6dfc1d1aad92e02a84bbe04.zip cpython-1cca273669598978f6dfc1d1aad92e02a84bbe04.tar.gz cpython-1cca273669598978f6dfc1d1aad92e02a84bbe04.tar.bz2 |
merge 3.4 (#22417)
Diffstat (limited to 'Lib/http')
-rw-r--r-- | Lib/http/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index 57e932d..0a58fcb 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -1267,7 +1267,7 @@ else: self.key_file = key_file self.cert_file = cert_file if context is None: - context = ssl._create_stdlib_context() + context = ssl._create_default_https_context() will_verify = context.verify_mode != ssl.CERT_NONE if check_hostname is None: check_hostname = will_verify |