diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:23:44 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:23:44 +0000 |
| commit | 9dc84b798932d9b0d8f935aca7d65dac3215920e (patch) | |
| tree | 8b5a7838192e91d5f2016f16ae4aa200cdd977db /synapse/server.py | |
| parent | Incorporate review (diff) | |
| parent | Add benchmarks for structured logging performance (#6266) (diff) | |
| download | synapse-9dc84b798932d9b0d8f935aca7d65dac3215920e.tar.xz | |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 90c3b072e8..be9af7f986 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -318,8 +318,8 @@ class HomeServer(object): def build_proxied_http_client(self): return SimpleHttpClient( self, - http_proxy=os.getenv("http_proxy"), - https_proxy=os.getenv("HTTPS_PROXY"), + http_proxy=os.getenvb(b"http_proxy"), + https_proxy=os.getenvb(b"HTTPS_PROXY"), ) def build_room_creation_handler(self): |