diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-19 16:22:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-19 16:22:05 +0100 |
| commit | 6ac40f7b65e4ae41e7e3bb2310b6094efe70b045 (patch) | |
| tree | 808fd1c1b8867c1d3e8667b2c1270a80905ec31f /synapse | |
| parent | Merge pull request #736 from matrix-org/markjh/slave_invited_rooms_for_user (diff) | |
| parent | Make InsecureInterceptableContextFactory work with SpiderEndpoint (diff) | |
| download | synapse-6ac40f7b65e4ae41e7e3bb2310b6094efe70b045.tar.xz | |
Merge pull request #737 from matrix-org/erikj/spider_ssl_factory
Use tls_server_context_factory for SpiderEndpoint
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 6c89b20984..902ae7a203 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -462,5 +462,8 @@ class InsecureInterceptableContextFactory(ssl.ContextFactory): self._context = SSL.Context(SSL.SSLv23_METHOD) self._context.set_verify(VERIFY_NONE, lambda *_: None) - def getContext(self, hostname, port): + def getContext(self, hostname=None, port=None): return self._context + + def creatorForNetloc(self, hostname, port): + return self |