summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-13 10:58:36 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-13 10:58:50 +0100
commit984e207b5982df26bec37223cd07b4044dcacdd2 (patch)
tree9b7cd2052ab91b4365bb43f46d2509b389bf1bab /synapse/app/homeserver.py
parentMerge branch 'develop' into server2server_signing (diff)
parentremove wishlist in favour of jira (diff)
downloadsynapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz
Merge branch develop into server2server_signing
Conflicts:
	synapse/app/homeserver.py
Diffstat (limited to 'synapse/app/homeserver.py')
-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 a77f137b4e..6394bc27d1 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -25,8 +25,8 @@ 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.server_key_resource import LocalKey
+from synapse.http.client import MatrixHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,
     SERVER_KEY_PREFIX,
@@ -49,7 +49,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()