diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-03 17:20:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-03 17:20:27 +0100 |
| commit | bd2cf9d4bfa9e150cded9a7e8fff652d38bf45ca (patch) | |
| tree | c7001e575907a5dae22797d124126025592aabc1 /synapse/rest | |
| parent | Merge pull request #174 from matrix-org/erikj/compress_option (diff) | |
| parent | SYN-403: Make content repository use its own http client. (diff) | |
| download | synapse-bd2cf9d4bfa9e150cded9a7e8fff652d38bf45ca.tar.xz | |
Merge pull request #177 from matrix-org/erikj/content_repo_http_client
SYN-403: Make content repository use its own http client.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/base_resource.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py index 4af5f73878..9a60b777ca 100644 --- a/synapse/rest/media/v1/base_resource.py +++ b/synapse/rest/media/v1/base_resource.py @@ -15,6 +15,7 @@ from .thumbnailer import Thumbnailer +from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.http.server import respond_with_json from synapse.util.stringutils import random_string from synapse.api.errors import ( @@ -52,7 +53,7 @@ class BaseMediaResource(Resource): def __init__(self, hs, filepaths): Resource.__init__(self) self.auth = hs.get_auth() - self.client = hs.get_http_client() + self.client = MatrixFederationHttpClient(hs) self.clock = hs.get_clock() self.server_name = hs.hostname self.store = hs.get_datastore() |