From 201178db1aea302d714d6da4dc188e9d103ee474 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 18 Mar 2021 20:31:47 +0000
Subject: [PATCH] federation_client: stop adding URL prefix (#9645)

---
 changelog.d/9645.misc            | 1 +
 scripts-dev/federation_client.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/9645.misc

diff --git a/changelog.d/9645.misc b/changelog.d/9645.misc
new file mode 100644
index 000000000..9a7ce364c
--- /dev/null
+++ b/changelog.d/9645.misc
@@ -0,0 +1 @@
+In the `federation_client` commandline client, stop automatically adding the URL prefix, so that servlets on other prefixes can be tested.
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py
index abcec48c4..657919a0d 100755
--- a/scripts-dev/federation_client.py
+++ b/scripts-dev/federation_client.py
@@ -223,7 +223,7 @@ def main():
     parser.add_argument("--body", help="Data to send as the body of the HTTP request")
 
     parser.add_argument(
-        "path", help="request path. We will add '/_matrix/federation/v1/' to this."
+        "path", help="request path, including the '/_matrix/federation/...' prefix."
     )
 
     args = parser.parse_args()
@@ -239,7 +239,7 @@ def main():
         args.server_name,
         key,
         args.destination,
-        "/_matrix/federation/v1/" + args.path,
+        args.path,
         content=args.body,
     )