[CalendarServer-changes] [1185] CalendarServer/trunk/twistedcaldav/directory/principal.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 14 08:02:41 PST 2007


Revision: 1185
          http://trac.macosforge.org/projects/calendarserver/changeset/1185
Author:   cdaboo at apple.com
Date:     2007-02-14 08:02:40 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Add absolute principal URIs to the calendar-user-address-set by default (as is done for the relative URI).

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

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-02-14 00:25:36 UTC (rev 1184)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-02-14 16:02:40 UTC (rev 1185)
@@ -443,6 +443,11 @@
         # the directory record provides.
         addresses = set(self.record.calendarUserAddresses)
         addresses.add(self.principalURL())
+        if not config.SSLOnly:
+            addresses.add("http://%s:%s%s" % (config.ServerHostName, config.Port, self.principalURL(),))
+        if config.SSLEnable:
+            addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, self.principalURL(),))
+        
         return addresses
 
     def scheduleInbox(self, request):

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070214/a522be74/attachment.html


More information about the calendarserver-changes mailing list