[CalendarServer-changes] [3512] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Dec 11 12:02:01 PST 2008


Revision: 3512
          http://trac.macosforge.org/projects/calendarserver/changeset/3512
Author:   sagen at apple.com
Date:     2008-12-11 12:02:00 -0800 (Thu, 11 Dec 2008)
Log Message:
-----------
Rename config.RedirectNonSSL to RedirectHTTPToHTTPS

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2008-12-11 19:53:02 UTC (rev 3511)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2008-12-11 20:02:00 UTC (rev 3512)
@@ -676,7 +676,7 @@
 
             for port in config.BindHTTPPorts:
 
-                if config.RedirectNonSSL and successfulSSLPorts:
+                if config.RedirectHTTPToHTTPS and successfulSSLPorts:
                     # Redirect non-SSL ports to the first ssl port
                     RedirectRequest.port = successfulSSLPorts[0]
                     self.log_info("Redirecting %s:%s to %s" %

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2008-12-11 19:53:02 UTC (rev 3511)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2008-12-11 20:02:00 UTC (rev 3512)
@@ -44,7 +44,7 @@
     <integer>8443</integer>
 
     <!-- Redirect non-SSL ports to an SSL port -->
-    <key>RedirectNonSSL</key>
+    <key>RedirectHTTPToHTTPS</key>
     <false/>
 
     <!--

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2008-12-11 19:53:02 UTC (rev 3511)
+++ CalendarServer/trunk/conf/caldavd.plist	2008-12-11 20:02:00 UTC (rev 3512)
@@ -46,7 +46,7 @@
     -->
 
     <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
-    <key>RedirectNonSSL</key>
+    <key>RedirectHTTPToHTTPS</key>
     <false/>
 
 

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2008-12-11 19:53:02 UTC (rev 3511)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-12-11 20:02:00 UTC (rev 3512)
@@ -91,7 +91,7 @@
     "ServerHostName": "", # Network host name.
     "HTTPPort": 0,        # HTTP port (0 to disable HTTP)
     "SSLPort" : 0,        # SSL port (0 to disable HTTPS)
-    "RedirectNonSSL" : False, # If True, all nonSSL requests redirected to an SSL Port
+    "RedirectHTTPToHTTPS" : False, # If True, all nonSSL requests redirected to an SSL Port
 
     # Note: we'd use None above, but that confuses the command-line parser.
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081211/f5128ad4/attachment.html>


More information about the calendarserver-changes mailing list