diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
| commit | 1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch) | |
| tree | 92d4bb31a1372239e317f8672d6b80e59b709523 /synapse/http/server.py | |
| parent | Oops. Removed my NetBeans private folders (diff) | |
| parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
| download | synapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz | |
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
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}), |