summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-09-01 23:28:43 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-09-01 23:28:43 +0100
commit68a04b92821186b479d4b9af8f7d45d0baf38325 (patch)
tree7ac26139d65b26feecb5e112a4be48264d40a20c /synapse/http
parentAdd unsecure listener port to homeserver (diff)
downloadsynapse-68a04b92821186b479d4b9af8f7d45d0baf38325.tar.xz
given everything's apparently gone https:// by default for c-s, change this hardcoding...
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/server.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 243b71744d..0b87718bfa 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -325,7 +325,11 @@ class ContentRepoResource(resource.Resource):
 
             # FIXME (erikj): These should use constants.
             file_name = os.path.basename(fname)
-            url = "http://%s/_matrix/content/%s" % (
+            # FIXME: we can't assume what the public mounted path of the repo is
+            # ...plus self-signed SSL won't work to remote clients anyway
+            # ...and we can't assume that it's SSL anyway, as we might want to
+            # server it via the non-SSL listener...
+            url = "https://%s/_matrix/content/%s" % (
                 self.hs.domain_with_port, file_name
             )