[CalendarServer-changes] [7230] CalendarServer/trunk/calendarserver/tap/util.py

[source_changes at macosforge.org]

Revision: 7230
          http://trac.macosforge.org/projects/calendarserver/changeset/7230
Author:   sagen at apple.com
Date:     2011-03-21 20:03:23 -0700 (Mon, 21 Mar 2011)
Log Message:
-----------
301 redirects for .well-known now include "main" port

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2011-03-22 03:02:45 UTC (rev 7229)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2011-03-22 03:03:23 UTC (rev 7230)
@@ -481,7 +481,15 @@
             (config.EnableCardDAV, "carddav"),
         ):
             if enabled:
-                wellKnownResource.putChild(wellknown_name, RedirectResource(path="/"))
+                host = config.ServerHostName
+                if config.EnableSSL:
+                    scheme = "https"
+                    port = config.SSLPort
+                else:
+                    scheme = "http"
+                    port = config.HTTPPort
+                wellKnownResource.putChild(wellknown_name, RedirectResource(
+                    scheme=scheme, port=port, path="/"))
 
     for name, info in config.Aliases.iteritems():
         if os.path.sep in name or not info.get("path", None):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110321/0598ff27/attachment.html>