From 68a04b92821186b479d4b9af8f7d45d0baf38325 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 1 Sep 2014 23:28:43 +0100
Subject: [PATCH] given everything's apparently gone https:// by default for
c-s, change this hardcoding...
---
synapse/http/server.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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
)
--
GitLab