Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 17:56:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,8 +77,8 @@ class PreviewUrlResource(DirectServeResource):
treq_args={"browser_like_redirects": True},
ip_whitelist=hs.config.url_preview_ip_range_whitelist,
ip_blacklist=hs.config.url_preview_ip_range_blacklist,
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"),
)
self.media_repo = media_repo
self.primary_base_path = media_repo.primary_base_path