Apply patch.

fusionapp · Feb 4, 2016 · f9a1914 · f9a1914
1 parent 515a512
commit f9a1914
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/xmantissa/publicweb.py b/xmantissa/publicweb.py
@@ -805,7 +805,7 @@ def beforeRender(self, ctx):
         action' and 'error' slots in the template accordingly.
         """
         generator = ixmantissa.ISiteURLGenerator(self.store)
-        url = generator.rootURL(IRequest(ctx))
+        url = URL.fromString('/')
         url = url.child('__login__')
         for seg in self.segments:
             url = url.child(seg)

diff --git a/xmantissa/web.py b/xmantissa/web.py
@@ -148,10 +148,11 @@ def rootURL(self, request):
             this website is available.
         """
         host = request.getHeader('host') or self.hostname
-        if ':' in host:
-            host = host.split(':', 1)[0]
-        if (host == self.hostname or
-            host.startswith('www.') and host[len('www.'):] == self.hostname):
+        #if ':' in host:
+        #    host = host.split(':', 1)[0]
+        #if (host == self.hostname or
+        #    host.startswith('www.') and host[len('www.'):] == self.hostname):
+        if True:
             return URL(scheme='', netloc='', pathsegs=[''])
         else:
             if request.isSecure():
@@ -365,7 +366,7 @@ def renderHTTP(self, context):
         """
         if getattr(self.wrappedResource, 'needsSecure', False):
             request = IRequest(context)
-            url = self.urlGenerator.encryptedRoot()
+            url = self.urlGenerator.encryptedRoot(request.getHeader('Host'))
             if url is not None:
                 for seg in request.prepath:
                     url = url.child(seg)