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

[source_changes at macosforge.org]

Revision: 8727
          http://trac.macosforge.org/projects/calendarserver/changeset/8727
Author:   sagen at apple.com
Date:     2012-02-17 16:07:00 -0800 (Fri, 17 Feb 2012)
Log Message:
-----------
Don't include the http(s) forms of calendar user address

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

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2012-02-17 23:34:47 UTC (rev 8726)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2012-02-18 00:07:00 UTC (rev 8727)
@@ -1050,10 +1050,6 @@
         # Add the principal URL and alternate URIs to the list.
         for uri in ((self.principalURL(),) + tuple(self.alternateURIs())):
             addresses.add(uri)
-            if config.HTTPPort:
-                addresses.add("http://%s:%s%s" % (config.ServerHostName, config.HTTPPort, uri))
-            if config.EnableSSL and config.SSLPort:
-                addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, uri))
 
         return addresses
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2012-02-17 23:34:47 UTC (rev 8726)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2012-02-18 00:07:00 UTC (rev 8727)
@@ -20,7 +20,6 @@
 from twistedcaldav.config import config
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
-from twistedcaldav.ical import Component
 from twistedcaldav.mail import MailGatewayTokensDatabase
 from twistedcaldav.upgrade import (
     xattrname, UpgradeError, upgradeData, updateFreeBusySet,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120217/d1664af2/attachment.html>