diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
| commit | 056f0991262902e22f0414e17c01198e1606384a (patch) | |
| tree | fa365dc1aef28f86499122d8b9176c03dd95e863 /synapse/app/frontend_proxy.py | |
| parent | Batch process handling state groups (diff) | |
| parent | Fix manhole on py3 (pt 2) (#4067) (diff) | |
| download | synapse-056f0991262902e22f0414e17c01198e1606384a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/app/frontend_proxy.py')
| -rw-r--r-- | synapse/app/frontend_proxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index fc4b25de1c..f5c61dec5b 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -68,7 +68,7 @@ class PresenceStatusStubServlet(ClientV1RestServlet): "Authorization": auth_headers, } result = yield self.http_client.get_json( - self.main_uri + request.uri, + self.main_uri + request.uri.decode('ascii'), headers=headers, ) defer.returnValue((200, result)) @@ -125,7 +125,7 @@ class KeyUploadServlet(RestServlet): "Authorization": auth_headers, } result = yield self.http_client.post_json_get_json( - self.main_uri + request.uri, + self.main_uri + request.uri.decode('ascii'), body, headers=headers, ) |