diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
| commit | a14665bde7730872627e956860be0d727a53e26d (patch) | |
| tree | eeb44967874a737bd2492b6591966a389de1aeda /synapse/http/matrixfederationclient.py | |
| parent | Bundle in some room state in the unsigned bit of the invite when sending to i... (diff) | |
| parent | Merge pull request #289 from matrix-org/markjh/fix_sql (diff) | |
| download | synapse-a14665bde7730872627e956860be0d727a53e26d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 1c9e552788..b50a0c445c 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -57,14 +57,14 @@ incoming_responses_counter = metrics.register_counter( class MatrixFederationEndpointFactory(object): def __init__(self, hs): - self.tls_context_factory = hs.tls_context_factory + self.tls_server_context_factory = hs.tls_server_context_factory def endpointForURI(self, uri): destination = uri.netloc return matrix_federation_endpoint( reactor, destination, timeout=10, - ssl_context_factory=self.tls_context_factory + ssl_context_factory=self.tls_server_context_factory ) |