openstack/deb-python-websocket-client
Code Issues Proposed changes

Merge pull request #176 from whitehats/sni

Browse Source 
Fix checking for SNI availability
This commit is contained in:
liris
2015-04-18 09:37:37 +09:00
parent 3bc1fcdb79 d9bac67e8c
commit 52a7cb56b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websocket/_http.py
View File

@@ -119,7 +119,7 @@ def _open_socket(addrinfo_list, sockopt, timeout):
def _can_use_sni():
return (six.Py2 and sys.version_info[1] >= 7 and sys.version_info[2] >= 9) or (six.PY3 and sys.version_info[2] >= 2)
return (six.PY2 and sys.version_info[1] >= 7 and sys.version_info[2] >= 9) or (six.PY3 and sys.version_info[2] >= 2)
def _wrap_sni_socket(sock, sslopt, hostname):
@@ -145,7 +145,7 @@ def _ssl_socket(sock, user_sslopt, hostname):
sslopt.update(user_sslopt)
check_hostname = sslopt.pop('check_hostname', True)
if _can_use_sni:
if _can_use_sni():
sock = _wrap_sni_socket(sock, sslopt, hostname)
else:
sock = ssl.wrap_socket(sock, **sslopt)