[CalendarServer-changes] [6417] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 6417
          http://trac.macosforge.org/projects/calendarserver/changeset/6417
Author:   sagen at apple.com
Date:     2010-10-13 10:49:27 -0700 (Wed, 13 Oct 2010)
Log Message:
-----------
SSLPort is always set now, so examine the config.EnableSSL flag instead.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/mail.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2010-10-12 20:20:26 UTC (rev 6416)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2010-10-13 17:49:27 UTC (rev 6417)
@@ -850,7 +850,7 @@
             addresses.add(uri)
             if config.HTTPPort:
                 addresses.add("http://%s:%s%s" % (config.ServerHostName, config.HTTPPort, uri))
-            if config.SSLPort:
+            if config.EnableSSL and config.SSLPort:
                 addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, uri))
 
         return addresses

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2010-10-12 20:20:26 UTC (rev 6416)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2010-10-13 17:49:27 UTC (rev 6417)
@@ -360,7 +360,7 @@
 
     data = str(calendar)
 
-    if config.SSLPort:
+    if config.EnableSSL:
         useSSL = True
         port = config.SSLPort
     else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101013/bf35b3a5/attachment.html>