Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Don't bother responding to client requests that have already disconnected #8465

Merged
merged 3 commits into from
Oct 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/8465.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't attempt to respond to some requests if the client has already disconnected.
5 changes: 5 additions & 0 deletions synapse/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,11 @@ def respond_with_json_bytes(
Returns:
twisted.web.server.NOT_DONE_YET if the request is still active.
"""
if request._disconnected:
logger.warning(
"Not sending response to request %s, already disconnected.", request
)
return

request.setResponseCode(code)
request.setHeader(b"Content-Type", b"application/json")
Expand Down
6 changes: 6 additions & 0 deletions synapse/rest/media/v1/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,12 @@ async def respond_with_responder(
file_size (int|None): Size in bytes of the media. If not known it should be None
upload_name (str|None): The name of the requested file, if any.
"""
if request._disconnected:
logger.warning(
"Not sending response to request %s, already disconnected.", request
)
return

if not responder:
respond_404(request)
return
Expand Down