Skip to content

bpo-27682: Handle client connection terminations in wsgiref. #9713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkerpeksag merged 4 commits into from
May 1, 2019
Merged

bpo-27682: Handle client connection terminations in wsgiref. #9713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f16d6f9
bpo-34547: Handle client connection terminations in wsgiref.
PetterS Oct 5, 2018
0234c09
bpo-27682: Handle two more types of errors.
PetterS Apr 23, 2019
32ed514
bpo-27682: Use StringIO directly instead of importing io.
PetterS Apr 23, 2019
380cec9
Use subTest
berkerpeksag May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Lib/test/test_wsgiref.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,24 @@ def flush(self):
b"Hello, world!",
written)

def testClientConnectionTerminations(self):
environ = {"SERVER_PROTOCOL": "HTTP/1.0"}
for exception in (
ConnectionAbortedError,
BrokenPipeError,
ConnectionResetError,
):
with self.subTest(exception=exception):
class AbortingWriter:
def write(self, b):
raise exception

stderr = StringIO()
h = SimpleHandler(BytesIO(), AbortingWriter(), stderr, environ)
h.run(hello_app)

self.assertFalse(stderr.getvalue())


if __name__ == "__main__":
unittest.main()
4 changes: 4 additions & 0 deletions Lib/wsgiref/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ def run(self, application):
self.setup_environ()
self.result = application(self.environ, self.start_response)
self.finish_response()
except (ConnectionAbortedError, BrokenPipeError, ConnectionResetError):
# We expect the client to close the connection abruptly from time
# to time.
return
except:
try:
self.handle_error()
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-10-05-16-01-00.bpo-34547.abbaa.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:class:`wsgiref.handlers.BaseHandler` now handles abrupt client connection
terminations gracefully. Patch by Petter Strandmark.