Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix startup error when http proxy is defined. (#6421) 

Guess I only tested this on python 2 :/

Fixes #6419.
This commit is contained in:
Richard van der Hoff 2019-11-26 18:10:50 +00:00 committed by Richard van der Hoff
parent b98971e8a4
commit 9b9ee75666
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6421.bugfix Normal file
View File

@ -0,0 +1 @@
Fix startup error when http proxy is defined.

4
synapse/rest/media/v1/preview_url_resource.py
View File

@ -77,8 +77,8 @@ class PreviewUrlResource(DirectServeResource):
treq_args={"browser_like_redirects": True}, treq_args={"browser_like_redirects": True},
ip_whitelist=hs.config.url_preview_ip_range_whitelist, ip_whitelist=hs.config.url_preview_ip_range_whitelist,
ip_blacklist=hs.config.url_preview_ip_range_blacklist, ip_blacklist=hs.config.url_preview_ip_range_blacklist,
http_proxy=os.getenv("http_proxy"), http_proxy=os.getenvb(b"http_proxy"),
https_proxy=os.getenv("HTTPS_PROXY"), https_proxy=os.getenvb(b"HTTPS_PROXY"),
) )
self.media_repo = media_repo self.media_repo = media_repo
self.primary_base_path = media_repo.primary_base_path self.primary_base_path = media_repo.primary_base_path

4
synapse/server.py
View File

@ -318,8 +318,8 @@ class HomeServer(object):
def build_proxied_http_client(self): def build_proxied_http_client(self):
return SimpleHttpClient( return SimpleHttpClient(
self, self,
http_proxy=os.getenv("http_proxy"), http_proxy=os.getenvb(b"http_proxy"),
https_proxy=os.getenv("HTTPS_PROXY"), https_proxy=os.getenvb(b"HTTPS_PROXY"),
) )
def build_room_creation_handler(self): def build_room_creation_handler(self):