diff options
| author | Lawouach <sh@defuze.org> | 2014-12-07 21:17:00 +0100 |
|---|---|---|
| committer | Lawouach <sh@defuze.org> | 2014-12-07 21:17:00 +0100 |
| commit | 1c7af2e8f3da1aa2ba0d535196446f8e79809943 (patch) | |
| tree | b25f5f0d45b5a40687b1cf330144a4e3183c65a0 | |
| parent | ea0c7265b7ec7b6362b4b8b0056d27c12d142ed1 (diff) | |
| download | cherrypy-1c7af2e8f3da1aa2ba0d535196446f8e79809943.tar.gz | |
Fix #1298 for CPython 2.7 with the builtin ssl module and pyOpenSSL 0.14. However, this will break pyOpenSSL on Pypy for now. Until we find the most appropriate solution that is
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index c197748e..8d8b04e4 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1324,8 +1324,8 @@ class HTTPConnection(object): def __init__(self, server, sock, makefile=CP_fileobject): self.server = server self.socket = sock - self.rfile = makefile(sock._sock, "rb", self.rbufsize) - self.wfile = makefile(sock._sock, "wb", self.wbufsize) + self.rfile = makefile(sock, "rb", self.rbufsize) + self.wfile = makefile(sock, "wb", self.wbufsize) self.requests_seen = 0 def communicate(self): |