summary refs log tree commit diff
path: root/synapse/http/client.py
diff options
context:
space:
mode:
authorQuentin Gliech <quentingliech@gmail.com>2020-05-08 14:30:40 +0200
committerGitHub <noreply@github.com>2020-05-08 08:30:40 -0400
commit616af44137c78d481024da83bb51ed0d50a49522 (patch)
tree0dff524691b7619ccb157755c4d138f33ec82ef9 /synapse/http/client.py
parentAdd room details admin endpoint (#7317) (diff)
downloadsynapse-616af44137c78d481024da83bb51ed0d50a49522.tar.xz
Implement OpenID Connect-based login (#7256)
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r--synapse/http/client.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 3797545824..58eb47c69c 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -359,6 +359,7 @@ class SimpleHttpClient(object):
         actual_headers = {
             b"Content-Type": [b"application/x-www-form-urlencoded"],
             b"User-Agent": [self.user_agent],
+            b"Accept": [b"application/json"],
         }
         if headers:
             actual_headers.update(headers)
@@ -399,6 +400,7 @@ class SimpleHttpClient(object):
         actual_headers = {
             b"Content-Type": [b"application/json"],
             b"User-Agent": [self.user_agent],
+            b"Accept": [b"application/json"],
         }
         if headers:
             actual_headers.update(headers)
@@ -434,6 +436,10 @@ class SimpleHttpClient(object):
 
             ValueError: if the response was not JSON
         """
+        actual_headers = {b"Accept": [b"application/json"]}
+        if headers:
+            actual_headers.update(headers)
+
         body = yield self.get_raw(uri, args, headers=headers)
         return json.loads(body)
 
@@ -467,6 +473,7 @@ class SimpleHttpClient(object):
         actual_headers = {
             b"Content-Type": [b"application/json"],
             b"User-Agent": [self.user_agent],
+            b"Accept": [b"application/json"],
         }
         if headers:
             actual_headers.update(headers)