summary refs log tree commit diff
path: root/synapse/http/client.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-16 15:35:35 +0100
committerErik Johnston <erik@matrix.org>2015-10-16 15:35:35 +0100
commit33646eb000e99abd4d9174276b105a4d0f00cfef (patch)
tree903158f9fd9ae20e1b025f3e974ec40f132fa276 /synapse/http/client.py
parentRemove unused import (diff)
parentMerge pull request #311 from matrix-org/markjh/postgres_fixes (diff)
downloadsynapse-33646eb000e99abd4d9174276b105a4d0f00cfef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r--synapse/http/client.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 9a5869abee..27e5190224 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -24,7 +24,6 @@ from canonicaljson import encode_canonical_json
 from twisted.internet import defer, reactor, ssl
 from twisted.web.client import (
     Agent, readBody, FileBodyProducer, PartialDownloadError,
-    HTTPConnectionPool,
 )
 from twisted.web.http_headers import Headers
 
@@ -59,11 +58,8 @@ class SimpleHttpClient(object):
         # The default context factory in Twisted 14.0.0 (which we require) is
         # BrowserLikePolicyForHTTPS which will do regular cert validation
         # 'like a browser'
-        pool = HTTPConnectionPool(reactor)
-        pool.maxPersistentPerHost = 10
         self.agent = Agent(
             reactor,
-            pool=pool,
             connectTimeout=15,
             contextFactory=hs.get_http_client_context_factory()
         )