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

[source_changes at macosforge.org]

Revision: 8567
          http://trac.macosforge.org/projects/calendarserver/changeset/8567
Author:   sagen at apple.com
Date:     2012-01-20 10:03:41 -0800 (Fri, 20 Jan 2012)
Log Message:
-----------
Only advertise digest auth on /apns

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

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2012-01-20 16:42:49 UTC (rev 8566)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2012-01-20 18:03:41 UTC (rev 8567)
@@ -378,6 +378,9 @@
     if newStore is None:
         raise RuntimeError("Internal error, 'newStore' must be specified.")
 
+    if resources is None:
+        resources = []
+
     # FIXME: this is only here to workaround circular imports
     doBind()
 
@@ -639,8 +642,13 @@
     if apnConfig.Enabled:
         log.info("Setting up APNS resource at /%s" %
             (apnConfig["SubscriptionURL"],))
-        apnResource = apnSubscriptionResourceClass(root, newStore)
-        root.putChild(apnConfig["SubscriptionURL"], apnResource)
+        # Only advertise digest auth on /apns
+        resources.append((
+            apnConfig["SubscriptionURL"],
+            apnSubscriptionResourceClass,
+            [],
+            "digest"
+        ))
 
     #
     # Configure ancillary data
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120120/c83fbed0/attachment.html>