diff options
| author | Marcus <bubu@bubu1.eu> | 2021-01-12 18:20:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 12:20:30 -0500 |
| commit | e385c8b4734b95c0738d6f4022d7bbb1621167db (patch) | |
| tree | bef89371938984327ff4697a0021b83b5f0630ab /synapse/http/client.py | |
| parent | Fix failures in Debian packaging (#9079) (diff) | |
| download | synapse-e385c8b4734b95c0738d6f4022d7bbb1621167db.tar.xz | |
Don't apply the IP range blacklist to proxy connections (#9084)
It is expected that the proxy would be on a private IP address so the configured proxy should be connected to regardless of the IP range blacklist.
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 29f40ddf5f..5f74ee1149 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -341,6 +341,7 @@ class SimpleHttpClient: self.agent = ProxyAgent( self.reactor, + hs.get_reactor(), connectTimeout=15, contextFactory=self.hs.get_http_client_context_factory(), pool=pool, |