summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-11-26 18:10:50 +0000
committerGitHub <noreply@github.com>2019-11-26 18:10:50 +0000
commitef1a85e7733bc1979f48357dd59b638110285075 (patch)
tree5204485986b64e19152de65f31f76fba303eafa7 /synapse/server.py
parentMerge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff)
downloadsynapse-ef1a85e7733bc1979f48357dd59b638110285075.tar.xz
Fix startup error when http proxy is defined. (#6421)
Guess I only tested this on python 2 :/

Fixes #6419.
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py4
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):