diff options
| author | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
| commit | acded821c4ff9da11ce7f916ca8b0f369bcb4e87 (patch) | |
| tree | 6a797cfae11a8cf64277ff878c090d7905db9d19 /synapse/http/client.py | |
| parent | Remove vector specific style (diff) | |
| parent | Fix more typos in per-request metrics (diff) | |
| download | synapse-acded821c4ff9da11ce7f916ca8b0f369bcb4e87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/http/client.py')
| -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 |