[CalendarServer-changes] [1886] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch

[source_changes at macosforge.org]

Revision: 1886
          http://trac.macosforge.org/projects/calendarserver/changeset/1886
Author:   wsanchez at apple.com
Date:     2007-09-20 12:18:56 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Send segments[1:] to _getChild, not segments.  Our existing patch
mistakenly removed the code that trimmed the first item from that
list.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2007-09-20 18:35:13 UTC (rev 1885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2007-09-20 19:18:56 UTC (rev 1886)
@@ -114,3 +114,12 @@
  
          def notFound(f):
              f.trap(http.HTTPError)
+@@ -417,7 +441,7 @@
+                 return f
+             return None
+ 
+-        d = defer.maybeDeferred(self._getChild, None, self.site.resource, segments, updatepaths=False)
++        d = defer.maybeDeferred(self._getChild, None, self.site.resource, segments[1:], updatepaths=False)
+         d.addCallback(self._rememberResource, path)
+         d.addErrback(notFound)
+         return d

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