summary refs log tree commit diff
path: root/scripts-dev/federation_client.py
diff options
context:
space:
mode:
authorBrendan Abolivier <contact@brendanabolivier.com>2018-11-09 11:00:55 +0000
committerGitHub <noreply@github.com>2018-11-09 11:00:55 +0000
commit0f3f0a64bfeccc4703494f9d1cdb6502c23cda39 (patch)
tree0c1946624b9d08613f604d5a7c1eb13017fcc58f /scripts-dev/federation_client.py
parentMerge pull request #4164 from matrix-org/erikj/fix_device_comparison (diff)
parentAdd a Content-Type header on POST requests to the federation client (diff)
downloadsynapse-0f3f0a64bfeccc4703494f9d1cdb6502c23cda39.tar.xz
Merge pull request #4168 from matrix-org/babolivier/federation-client-content-type
Add a Content-Type header on POST requests to the federation client script
Diffstat (limited to 'scripts-dev/federation_client.py')
-rwxr-xr-xscripts-dev/federation_client.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py
index 2566ce7cef..e0287c8c6c 100755
--- a/scripts-dev/federation_client.py
+++ b/scripts-dev/federation_client.py
@@ -154,10 +154,15 @@ def request_json(method, origin_name, origin_key, destination, path, content):
     s = requests.Session()
     s.mount("matrix://", MatrixConnectionAdapter())
 
+    headers = {"Host": destination, "Authorization": authorization_headers[0]}
+
+    if method == "POST":
+        headers["Content-Type"] = "application/json"
+
     result = s.request(
         method=method,
         url=dest,
-        headers={"Host": destination, "Authorization": authorization_headers[0]},
+        headers=headers,
         verify=False,
         data=content,
     )
@@ -203,7 +208,7 @@ def main():
     parser.add_argument(
         "-X",
         "--method",
-        help="HTTP method to use for the request. Defaults to GET if --data is"
+        help="HTTP method to use for the request. Defaults to GET if --body is"
         "unspecified, POST if it is.",
     )