diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
| commit | f452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch) | |
| tree | edae89fefddc1f820f5bcae8409a85c36f1b2a0e /synapse/http | |
| parent | Fix the tests to include new db calls (diff) | |
| parent | Merge branch 'server2server_tls' into develop (diff) | |
| download | synapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 8 | ||||
| -rw-r--r-- | synapse/http/endpoint.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 36ba2c6591..093bdf0e3f 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -113,8 +113,9 @@ class TwistedHttpClient(HttpClient): requests. """ - def __init__(self): + def __init__(self, hs): self.agent = MatrixHttpAgent(reactor) + self.hs = hs @defer.inlineCallbacks def put_json(self, destination, path, data): @@ -177,7 +178,10 @@ class TwistedHttpClient(HttpClient): retries_left = 5 # TODO: setup and pass in an ssl_context to enable TLS - endpoint = matrix_endpoint(reactor, destination, timeout=10) + endpoint = matrix_endpoint( + reactor, destination, timeout=10, + ssl_context_factory=self.hs.tls_context_factory + ) while True: try: diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index d91500b07d..a6ebe23567 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None, default_port = 8080 else: transport_endpoint = SSL4ClientEndpoint - endpoint_kw_args.update(ssl_context_factory=ssl_context_factory) + endpoint_kw_args.update(sslContextFactory=ssl_context_factory) default_port = 443 if port is None: |