summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-02 13:57:48 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-02 14:03:26 +0100
commit4f11518934c3e032a763f115a73261414d67f87b (patch)
tree030ed29a6bbf57f706be58bcdcde8536bfafe5d0 /synapse/app
parentMerge branch 'master' into develop (diff)
downloadsynapse-4f11518934c3e032a763f115a73261414d67f87b.tar.xz
Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2f1b954902..61d574a00f 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -25,7 +25,7 @@ from twisted.web.static import File
 from twisted.web.server import Site
 from synapse.http.server import JsonResource, RootRedirect
 from synapse.http.content_repository import ContentRepoResource
-from synapse.http.client import TwistedHttpClient
+from synapse.http.client import MatrixHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX
 )
@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__)
 class SynapseHomeServer(HomeServer):
 
     def build_http_client(self):
-        return TwistedHttpClient(self)
+        return MatrixHttpClient(self)
 
     def build_resource_for_client(self):
         return JsonResource()