summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-27 10:44:55 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-27 10:44:55 +0000
commitd840ee5bdefcd4278a65a8f38d50ad9c9cace677 (patch)
tree3bf024715f2183a1d6adeba7a7b61aa36a0f6b4a
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
downloadsynapse-d840ee5bdefcd4278a65a8f38d50ad9c9cace677.tar.xz
Revert "skip send without trailing slash"
I think this was done back when most synapses would reject the
no-trailing-slash version; it's no longer required, and makes matrix.org spec-incompliant.

This reverts commit fc5be50d561dcf0f069c5b4920faa0dfd3a962e2.
-rw-r--r--synapse/federation/transport/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 9c6f22760d..dc563538de 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -152,7 +152,7 @@ class TransportLayerClient(object):
         # generated by the json_data_callback.
         json_data = transaction.get_dict()
 
-        path = _create_v1_path("/send/%s/", transaction.transaction_id)
+        path = _create_v1_path("/send/%s", transaction.transaction_id)
 
         response = yield self.client.put_json(
             transaction.destination,
@@ -161,7 +161,7 @@ class TransportLayerClient(object):
             json_data_callback=json_data_callback,
             long_retries=True,
             backoff_on_404=True,  # If we get a 404 the other side has gone
-            # try_trailing_slash_on_400=True,
+            try_trailing_slash_on_400=True,
         )
 
         return response