Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-05-02 19:54:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/release-v1.25.0'

Browse source
This commit is contained in:
Tulir Asokan 2021-01-13 12:40:19 +02:00
commit 893b42a910
9 changed files with 229 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
synapse/http/client.py
View file

@ -342,6 +342,7 @@ class SimpleHttpClient:
self.agent = ProxyAgent(
self.reactor,
hs.get_reactor(),
connectTimeout=15,
contextFactory=self.hs.get_http_client_context_factory(),
pool=pool,