summary refs log tree commit diff
path: root/synapse/http/client.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-19 15:39:08 +0100
committerErik Johnston <erik@matrix.org>2016-04-19 16:08:14 +0100
commitf505575f69f90eb027acb093819c083ed49a8008 (patch)
tree21c39b2e2a2390ee1135872fe7a3fa8323365813 /synapse/http/client.py
parentAdd self.media_repo to PreviewUrlResource (diff)
downloadsynapse-f505575f69f90eb027acb093819c083ed49a8008.tar.xz
Make InsecureInterceptableContextFactory work with SpiderEndpoint
Diffstat (limited to '')
-rw-r--r--synapse/http/client.py5
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