Merge branch 'master' into develop

2014-12-02 17:21:17 +00:00 · 2014-12-02 17:21:17 +00:00 · c9f5af1de7
parent 481f5a2cbe 7993e3d10d
commit c9f5af1de7
1 changed files with 5 additions and 2 deletions
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@ -35,8 +35,11 @@ class ServerConfig(Config):
        if not args.content_addr:
            host = args.server_name
            if ':' not in host:
-                host = "%s:%d" % (host, args.bind_port)
-            args.content_addr = "https://%s" % (host,)
+                host = "%s:%d" % (host, args.unsecure_port)
+            else:
+                host = host.split(':')[0]
+                host = "%s:%d" % (host, args.unsecure_port)
+            args.content_addr = "http://%s" % (host,)

        self.content_addr = args.content_addr