summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2018-03-24 14:36:50 (GMT)
committerGitHub <noreply@github.com>2018-03-24 14:36:50 (GMT)
commite42ae915095ebca789cc36f3a336a3331fe35945 (patch)
treee004fa88ee5ba79a4e4b1fded82b6e903bce8df0 /Lib/ssl.py
parentd8b291a74284307610946f1b5801aa95d7f1e052 (diff)
downloadcpython-e42ae915095ebca789cc36f3a336a3331fe35945.zip
cpython-e42ae915095ebca789cc36f3a336a3331fe35945.tar.gz
cpython-e42ae915095ebca789cc36f3a336a3331fe35945.tar.bz2
bpo-24334: Remove inaccurate match_hostname call (#6211)
Commit 141c5e8c re-added match_hostname() call. The resurrection of the function call was never intended and was solely a merge mistake. Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 2db8873..fdd1615 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -1106,11 +1106,6 @@ class SSLSocket(socket):
if timeout == 0.0 and block:
self.settimeout(None)
self._sslobj.do_handshake()
- if self.context.check_hostname:
- if not self.server_hostname:
- raise ValueError("check_hostname needs server_hostname "
- "argument")
- match_hostname(self.getpeercert(), self.server_hostname)
finally:
self.settimeout(timeout)