summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:20 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:20 +0100
commit118e789e0c097e147428ac456b60be3281c5264e (patch)
tree3464c466ce6e4e909a75b71b382561e5e1792b93 /synapse/http/matrixfederationclient.py
parentMerge branch 'matrix-org-hotfixes' of github.com:matrix-org/synapse into matr... (diff)
parentUpdate changelog for v1.32.0 (diff)
downloadsynapse-118e789e0c097e147428ac456b60be3281c5264e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 5f01ebd3d4..ab47dec8f2 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py
@@ -272,7 +272,7 @@ class MatrixFederationHttpClient: self, request: MatrixFederationRequest, try_trailing_slash_on_400: bool = False, - **send_request_args + **send_request_args, ) -> IResponse: """Wrapper for _send_request which can optionally retry the request upon receiving a combination of a 400 HTTP response code and a