diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-03-17 22:32:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 21:32:25 +0000 |
| commit | c37db0211e36cd298426ff8811e547b0acd10bf4 (patch) | |
| tree | 4ca360ac774aa64c29a763d2394680da0afad498 /synapse/http/client.py | |
| parent | Set charset to utf-8 when adding headers for certain text content types (#7044) (diff) | |
| download | synapse-c37db0211e36cd298426ff8811e547b0acd10bf4.tar.xz | |
Share SSL contexts for non-federation requests (#7094)
Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests. Fixes #7092.
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index d4c285445e..3797545824 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -244,9 +244,6 @@ class SimpleHttpClient(object): pool.maxPersistentPerHost = max((100 * CACHE_SIZE_FACTOR, 5)) pool.cachedConnectionTimeout = 2 * 60 - # The default context factory in Twisted 14.0.0 (which we require) is - # BrowserLikePolicyForHTTPS which will do regular cert validation - # 'like a browser' self.agent = ProxyAgent( self.reactor, connectTimeout=15, |