summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Shepelev <temotor@gmail.com>2015-05-02 04:43:47 +0300
committerSergey Shepelev <temotor@gmail.com>2015-05-02 04:44:13 +0300
commita07f836b890585762d1e2bb83db0803a19f7146e (patch)
tree61ff77118de1ad998e60abe12eb04bc9044eb8a5
parentf1dd17833f8eb28bcb87132d9b538ce930369550 (diff)
downloadeventlet-gh-226.tar.gz
ssl: incorrect initalization of default context; Thanks to stuart-mclarengh-226
https://github.com/eventlet/eventlet/issues/226
-rw-r--r--eventlet/green/ssl.py2
-rw-r--r--tests/manual/regress-226-unpatched-ssl.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py
index f0cd2d2..ded6533 100644
--- a/eventlet/green/ssl.py
+++ b/eventlet/green/ssl.py
@@ -359,7 +359,7 @@ if hasattr(__ssl, 'sslwrap_simple'):
if hasattr(__ssl, 'SSLContext'):
@functools.wraps(__ssl.SSLContext.wrap_socket)
def _green_sslcontext_wrap_socket(self, sock, *a, **kw):
- return GreenSSLSocket(sock, *a, **kw)
+ return GreenSSLSocket(sock, *a, _context=self, **kw)
# FIXME:
# * GreenSSLContext akin to GreenSSLSocket
diff --git a/tests/manual/regress-226-unpatched-ssl.py b/tests/manual/regress-226-unpatched-ssl.py
new file mode 100644
index 0000000..2d0d49c
--- /dev/null
+++ b/tests/manual/regress-226-unpatched-ssl.py
@@ -0,0 +1,3 @@
+import eventlet
+import requests
+requests.get('https://www.google.com/').status_code