summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-13 20:29:38 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-13 20:29:38 +0000
commit9a2e22fd41845b6fa7f30c66cf89a368af269147 (patch)
treecdff56c75c71eeb257e8c32eb5fb9229c5fcdd5f
parenti should have given up x3 (diff)
downloadsynapse-9a2e22fd41845b6fa7f30c66cf89a368af269147.tar.xz
is this what purgatory feels like
-rw-r--r--synapse/http/matrixfederationclient.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 74ea6bcf8e..59e758fefb 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py
@@ -217,14 +217,14 @@ class MatrixFederationHttpClient(object): """ response = yield self._send_request(**send_request_args) - if not try_trailing_slash_on_400: - defer.returnValue(response) - # Check if it's necessary to retry with a trailing slash body = yield _handle_json_response( self.hs.get_reactor(), self.default_timeout, request, response, ) + if not try_trailing_slash_on_400: + defer.returnValue(body) + # Retry with a trailing slash if we received a 400 with # 'M_UNRECOGNIZED' which some endpoints can return when omitting a # trailing slash on Synapse <=v0.99.2.