summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-09-09 14:27:30 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-09-09 14:27:30 +0100
commit2c746382e0a5da7e0640b149b2a4620706967324 (patch)
treea3629622a9035033fae45d43bc988b5ac51e8961 /synapse/handlers/auth.py
parentDon't require pdus in check_auth script (diff)
parentBetter document the intent of the insecure SSL setting (diff)
downloadsynapse-2c746382e0a5da7e0640b149b2a4620706967324.tar.xz
Merge branch 'daniel/insecureclient' into develop
Diffstat (limited to 'synapse/handlers/auth.py')
-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={