summary refs log tree commit diff
path: root/synapse/http/proxyagent.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 13:37:49 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 13:39:50 +0100
commit2036503c9e24198df36e2beca1d8aa8571fc125b (patch)
tree67c4a212e4d26b609c6011597c3fee5e6b6c98b2 /synapse/http/proxyagent.py
parentMerge commit '3d2acc930' into anoa/dinsic_release_1_31_0 (diff)
parentMerge tag 'v1.28.0rc1' into develop (diff)
downloadsynapse-2036503c9e24198df36e2beca1d8aa8571fc125b.tar.xz
Merge commit 'd9f1dccba' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/http/proxyagent.py')
-rw-r--r--synapse/http/proxyagent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/proxyagent.py b/synapse/http/proxyagent.py

index ee65a6668b..16ec850064 100644 --- a/synapse/http/proxyagent.py +++ b/synapse/http/proxyagent.py
@@ -179,7 +179,8 @@ class ProxyAgent(_AgentBase): should_skip_proxy = False if self.no_proxy is not None: should_skip_proxy = proxy_bypass_environment( - parsed_uri.host.decode(), proxies={"no": self.no_proxy}, + parsed_uri.host.decode(), + proxies={"no": self.no_proxy}, ) if (