diff options
| author | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
| commit | aa4d8c1f9aa32693412642650a7c626e164af286 (patch) | |
| tree | eda7203d761213e14854fd8972c8e693dd1396ff /synapse/http/client.py | |
| parent | Preparatory refactors of OidcHandler (#9067) (diff) | |
| parent | Move removal warning up changelog (diff) | |
| download | synapse-aa4d8c1f9aa32693412642650a7c626e164af286.tar.xz | |
Merge branch 'master' into develop
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, |