[CalendarServer-changes] [101] CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch

[source_changes at macosforge.org]

Revision: 101
Author:   cdaboo at apple.com
Date:     2006-09-06 11:43:01 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
Fix bug with URL quoting.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch

Modified: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch	2006-09-01 20:30:33 UTC (rev 100)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch	2006-09-06 18:43:01 UTC (rev 101)
@@ -11,16 +11,21 @@
  from urlparse import urlsplit
  
  import weakref
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,12 @@
          if newpath is StopTraversal:
              # We need to rethink how to do this.
              #if newres is res:
 -                self._rememberURLForResource(path, res)
-+                self._rememberURLForResource(quote(path), res)
++                if path:
++                    url = "/" + "/".join(path)
++                else:
++                    url = "/"
++        
++                self._rememberURLForResource(quote(url), res)
                  return res
              #else:
              #    raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
-@@ -337,7 +337,7 @@
+@@ -337,7 +342,7 @@
                  self.prepath.append(self.postpath.pop(0))
  
          child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
@@ -29,7 +34,7 @@
  
          return child
  
-@@ -404,6 +404,7 @@
+@@ -404,6 +409,7 @@
          segments = path.split("/")
          assert segments[0] == "", "URL path didn't begin with '/': %s" % (path,)
          segments = segments[1:]

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