diff options
| author | Quentin Gliech <quentingliech@gmail.com> | 2020-05-08 14:30:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 08:30:40 -0400 |
| commit | 616af44137c78d481024da83bb51ed0d50a49522 (patch) | |
| tree | 0dff524691b7619ccb157755c4d138f33ec82ef9 /synapse/http | |
| parent | Add room details admin endpoint (#7317) (diff) | |
| download | synapse-616af44137c78d481024da83bb51ed0d50a49522.tar.xz | |
Implement OpenID Connect-based login (#7256)
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 7 |
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) |