summary refs log tree commit diff
diff options
context:
space:
mode:
authorFr3shTea <31766876+Fr3shTea@users.noreply.github.com>2022-01-05 11:59:29 +0000
committerGitHub <noreply@github.com>2022-01-05 11:59:29 +0000
commit0201c6371cdfa0e8245c59686c131e40384bbac2 (patch)
tree67203385b717f9bde8fa340da0902bd5dd9b379f
parentAdd admin API to get users' account data (#11664) (diff)
downloadsynapse-0201c6371cdfa0e8245c59686c131e40384bbac2.tar.xz
Fix SimpleHttpClient not sending Accept header in `get_json` (#11677)
Co-authored-by: reivilibre <olivier@librepush.net>
-rw-r--r--changelog.d/11677.bugfix1
-rw-r--r--synapse/http/client.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11677.bugfix b/changelog.d/11677.bugfix
new file mode 100644
index 0000000000..5691064a30
--- /dev/null
+++ b/changelog.d/11677.bugfix
@@ -0,0 +1 @@
+Fix wrong variable reference in `SimpleHttpClient.get_json` that results in the absence of the `Accept` header in the request.
diff --git a/synapse/http/client.py b/synapse/http/client.py
index fbbeceabeb..ca33b45cb2 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -588,7 +588,7 @@ class SimpleHttpClient:
         if headers:
             actual_headers.update(headers)  # type: ignore
 
-        body = await self.get_raw(uri, args, headers=headers)
+        body = await self.get_raw(uri, args, headers=actual_headers)
         return json_decoder.decode(body.decode("utf-8"))
 
     async def put_json(