wsgi: ignore ssl.SSLZeroReturnError at request finish()

fixes #739 plus small cleanup of redundant lines in wsgi_test
eventlet · Jan 22, 2023 · 0dac792 · 0dac792
1 parent 80b7cfa
commit 0dac792
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py
@@ -749,6 +749,9 @@ def get_environ(self):
     def finish(self):
         try:
             BaseHTTPServer.BaseHTTPRequestHandler.finish(self)
+        except ssl.SSLZeroReturnError:
+            # TLS version of connection reset by peer
+            pass
         except socket.error as e:
             # Broken pipe, connection reset by peer
             if support.get_errno(e) not in BROKEN_SOCK:

diff --git a/tests/wsgi_test.py b/tests/wsgi_test.py
@@ -446,9 +446,6 @@ def wsgi_app(environ, start_response):
             start_response('200 OK', {})
             return [environ['wsgi.input'].read()]
 
-        certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt')
-        private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
-
         server_sock = eventlet.wrap_ssl(eventlet.listen(('localhost', 0)),
                                         certfile=certificate_file,
                                         keyfile=private_key_file,
@@ -469,8 +466,6 @@ def wsgi_app(environ, start_response):
             start_response("200 OK", [])
             return [b""]
 
-        certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt')
-        private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
         server_sock = eventlet.wrap_ssl(eventlet.listen(('localhost', 0)),
                                         certfile=certificate_file,
                                         keyfile=private_key_file,
@@ -573,9 +568,6 @@ def wsgi_app(environ, start_response):
             start_response('200 OK', [])
             return [environ['wsgi.input'].read()]
 
-        certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt')
-        private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
-
         sock = eventlet.wrap_ssl(
             eventlet.listen(('localhost', 0)),
             certfile=certificate_file, keyfile=private_key_file,