mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#22959)

Browse source
This commit is contained in:
Benjamin Peterson 2014-12-07 13:47:34 -05:00
commit b46247bee5
4 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/http/client.py
View file

@ -1274,8 +1274,8 @@ else:
context = ssl._create_default_https_context()
will_verify = context.verify_mode != ssl.CERT_NONE
if check_hostname is None:
check_hostname = will_verify
elif check_hostname and not will_verify:
check_hostname = context.check_hostname
if check_hostname and not will_verify:
raise ValueError("check_hostname needs a SSL context with "
"either CERT_OPTIONAL or CERT_REQUIRED")
if key_file or cert_file: