summary refs log tree commit diff
path: root/synapse/rest/media/v1/preview_url_resource.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-18 16:34:53 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-18 16:34:53 +0000
commit926fc8f23e2ecbf331da342e808fb1647d8d8cea (patch)
tree03a1931a5f9e151a2ae05f057db2112d32206d1e /synapse/rest/media/v1/preview_url_resource.py
parentMerge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff)
parentFix startup error when http proxy is defined. (#6421) (diff)
downloadsynapse-926fc8f23e2ecbf331da342e808fb1647d8d8cea.tar.xz
Fix startup error when http proxy is defined. (#6421)
* commit 'ef1a85e77':
  Fix startup error when http proxy is defined. (#6421)
Diffstat (limited to 'synapse/rest/media/v1/preview_url_resource.py')
-rw-r--r--synapse/rest/media/v1/preview_url_resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py

index a23d6f5c75..fb0d02aa83 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py
@@ -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