[CalendarServer-changes] [4914] CalendarServer/branches/users/wsanchez/deployment/lib-patches/ Twisted/twisted.web2.dav.resource.patch

[source_changes at macosforge.org]

Revision: 4914
          http://trac.macosforge.org/projects/calendarserver/changeset/4914
Author:   cdaboo at apple.com
Date:     2010-01-08 09:22:12 -0800 (Fri, 08 Jan 2010)
Log Message:
-----------
Make sure quota update does not go on to read xattrs on the parent collections.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.web2.dav.resource.patch	2010-01-07 18:53:47 UTC (rev 4913)
+++ CalendarServer/branches/users/wsanchez/deployment/lib-patches/Twisted/twisted.web2.dav.resource.patch	2010-01-08 17:22:12 UTC (rev 4914)
@@ -676,7 +676,7 @@
  
          if isinstance(principal, davxml.HRef):
              yield principal
-@@ -1517,6 +1611,270 @@
+@@ -1517,6 +1611,272 @@
          return None
  
      ##
@@ -885,6 +885,8 @@
 +                d = waitForDeferred(self.updateQuotaUse(request, adjust))
 +                yield d
 +                d.getResult()
++                yield None
++                return
 +        
 +        # Check the next parent
 +        url = request.urlForResource(self)
@@ -947,7 +949,7 @@
      # HTTP
      ##
  
-@@ -1525,15 +1883,11 @@
+@@ -1525,15 +1885,11 @@
          #litmus = request.headers.getRawHeaders("x-litmus")
          #if litmus: log.msg("*** Litmus test: %s ***" % (litmus,))
  
@@ -965,7 +967,7 @@
  
          def setHeaders(response):
              response = IResponse(response)
-@@ -1567,7 +1921,7 @@
+@@ -1567,7 +1923,7 @@
      def findChildren(self, depth, request, callback, privileges=None, inherited_aces=None):
          return succeed(None)
  
@@ -974,7 +976,7 @@
      """
      Resource representing a WebDAV principal.  (RFC 3744, section 2)
      """
-@@ -1577,7 +1931,7 @@
+@@ -1577,7 +1933,7 @@
      # WebDAV
      ##
  
@@ -983,7 +985,7 @@
          (dav_namespace, "alternate-URI-set"),
          (dav_namespace, "principal-URL"    ),
          (dav_namespace, "group-member-set" ),
-@@ -1585,14 +1939,11 @@
+@@ -1585,14 +1941,11 @@
      )
  
      def davComplianceClasses(self):
@@ -999,7 +1001,7 @@
      def readProperty(self, property, request):
          def defer():
              if type(property) is tuple:
-@@ -1610,10 +1961,20 @@
+@@ -1610,10 +1963,20 @@
                      return davxml.PrincipalURL(davxml.HRef(self.principalURL()))
  
                  if name == "group-member-set":
@@ -1022,7 +1024,7 @@
  
                  if name == "resourcetype":
                      if self.isCollection():
-@@ -1655,7 +2016,7 @@
+@@ -1655,7 +2018,7 @@
          principals.  Subclasses should override this method to provide member
          URLs for this resource if appropriate.
          """
@@ -1031,7 +1033,7 @@
  
      def groupMemberships(self):
          """
-@@ -1666,6 +2027,7 @@
+@@ -1666,6 +2029,7 @@
          """
          unimplemented(self)
  
@@ -1039,7 +1041,7 @@
      def principalMatch(self, href):
          """
          Check whether the supplied principal matches this principal or is a
-@@ -1675,10 +2037,33 @@
+@@ -1675,10 +2039,33 @@
          """
          uri = str(href)
          if self.principalURL() == uri:
@@ -1075,7 +1077,7 @@
  class AccessDeniedError(Exception):
      def __init__(self, errors):
          """ 
-@@ -1718,6 +2103,37 @@
+@@ -1718,6 +2105,37 @@
  davxml.registerElement(TwistedACLInheritable)
  davxml.ACE.allowed_children[(twisted_dav_namespace, "inheritable")] = (0, 1)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100108/aceb5a5e/attachment.html>