summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-07 18:18:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-07 18:18:25 (GMT)
commita090f01bb63d73382e6e65b0364047c50afae5c2 (patch)
tree7d51bda9c589d72eeada9f24e2fd20acc965a4e5 /Lib/http
parentb92fd01189c74c76a70ecf24d723d2f5c0ffc5b9 (diff)
downloadcpython-a090f01bb63d73382e6e65b0364047c50afae5c2.zip
cpython-a090f01bb63d73382e6e65b0364047c50afae5c2.tar.gz
cpython-a090f01bb63d73382e6e65b0364047c50afae5c2.tar.bz2
HTTPSConnection: prefer the context's check_hostname attribute over the constructor parameter (#22959)
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 281e7f2..c0760dd 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1210,8 +1210,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: