summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-09-15 16:52:38 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-09-15 16:52:38 +0100
commit2c8f16257a3c8d4ad330f584f59f5e678207af14 (patch)
tree2745c1dff2e67b7bec31ca96d79bce999f9bf788 /synapse/handlers
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUse shorter config key name (diff)
downloadsynapse-2c8f16257a3c8d4ad330f584f59f5e678207af14.tar.xz
Merge pull request #272 from matrix-org/daniel/insecureclient
Allow configuration to ignore invalid SSL certs
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/auth.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index 59f687e0f1..793b3fcd8b 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py
@@ -19,7 +19,6 @@ from ._base import BaseHandler from synapse.api.constants import LoginType from synapse.types import UserID from synapse.api.errors import LoginError, Codes -from synapse.http.client import SimpleHttpClient from synapse.util.async import run_on_reactor from twisted.web.client import PartialDownloadError @@ -187,7 +186,7 @@ class AuthHandler(BaseHandler): # TODO: get this from the homeserver rather than creating a new one for # each request try: - client = SimpleHttpClient(self.hs) + client = self.hs.get_simple_http_client() resp_body = yield client.post_urlencoded_get_json( self.hs.config.recaptcha_siteverify_api, args={