summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-20 11:07:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-20 11:07:36 +0000
commit551ea1155966c023d7d2eb41454598bf14cb4be2 (patch)
treebca7b01b19d98677ed14136dca32dc11a8663f09
parentFederation test fixed! (diff)
downloadsynapse-551ea1155966c023d7d2eb41454598bf14cb4be2.tar.xz
Just return if not doing any trailing slash shennanigans
-rw-r--r--synapse/http/matrixfederationclient.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 2be0244870..1307508e5a 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -226,6 +226,8 @@ class MatrixFederationHttpClient(object):
             body = yield _handle_json_response(
                 self.hs.get_reactor(), self.default_timeout, request, response,
             )
+
+            defer.returnValue(body)
         except HttpResponseException as e:
             if not try_trailing_slash_on_400:
                 # Received an error >= 300. Raise unless we're retrying