diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-24 12:17:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-24 12:17:59 +0100 |
| commit | 4521c2d277fd56e505f28ebf372d204c52a4f979 (patch) | |
| tree | 73d30c9aaa8c99a7f6ba18eb3f23b5521bb3d1b2 /synapse/http/server.py | |
| parent | oops (diff) | |
| parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
| download | synapse-4521c2d277fd56e505f28ebf372d204c52a4f979.tar.xz | |
Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index d1f99460c1..66f966fcaa 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -325,7 +325,9 @@ class ContentRepoResource(resource.Resource): # FIXME (erikj): These should use constants. file_name = os.path.basename(fname) - url = "http://%s/matrix/content/%s" % (self.hs.hostname, file_name) + url = "http://%s/matrix/content/%s" % ( + self.hs.domain_with_port, file_name + ) respond_with_json_bytes(request, 200, json.dumps({"content_token": url}), |