[CalendarServer-changes] [138]
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted
source_changes at macosforge.org
source_changes at macosforge.org
Thu Sep 14 20:40:57 PDT 2006
Revision: 138
Author: cdaboo at apple.com
Date: 2006-09-14 20:40:47 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Sync with latest Twisted.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.basic.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.digest.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.interfaces.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.wrapper.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.davxml.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.idav.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put_common.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.static.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.server.patch
CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.basic.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.basic.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.basic.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/auth/basic.py
===================================================================
---- twisted/web2/auth/basic.py (revision 17932)
+--- twisted/web2/auth/basic.py (revision 18157)
+++ twisted/web2/auth/basic.py (working copy)
@@ -20,7 +20,7 @@
def getChallenge(self, peer):
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.digest.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.digest.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/auth/digest.py
===================================================================
---- twisted/web2/auth/digest.py (revision 17932)
+--- twisted/web2/auth/digest.py (revision 18157)
+++ twisted/web2/auth/digest.py (working copy)
@@ -154,7 +154,7 @@
'algorithm': self.algorithm,
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.interfaces.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.interfaces.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.interfaces.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/auth/interfaces.py
===================================================================
---- twisted/web2/auth/interfaces.py (revision 17932)
+--- twisted/web2/auth/interfaces.py (revision 18157)
+++ twisted/web2/auth/interfaces.py (working copy)
@@ -13,7 +13,7 @@
@return: dictionary of challenge arguments
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.wrapper.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.wrapper.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.auth.wrapper.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/auth/wrapper.py
===================================================================
---- twisted/web2/auth/wrapper.py (revision 17932)
+--- twisted/web2/auth/wrapper.py (revision 18157)
+++ twisted/web2/auth/wrapper.py (working copy)
@@ -87,7 +87,7 @@
return UnauthorizedResource(self.credentialFactories)
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.davxml.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/davxml.py
===================================================================
---- twisted/web2/dav/davxml.py (revision 18092)
+--- twisted/web2/dav/davxml.py (revision 18157)
+++ twisted/web2/dav/davxml.py (working copy)
@@ -45,6 +45,7 @@
from twisted.web2.dav.element.rfc2518 import *
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/__init__.py
===================================================================
---- twisted/web2/dav/element/__init__.py (revision 17935)
+--- twisted/web2/dav/element/__init__.py (revision 18157)
+++ twisted/web2/dav/element/__init__.py (working copy)
@@ -35,4 +35,5 @@
"rfc2518",
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.idav.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.idav.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.idav.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,8 +1,8 @@
Index: twisted/web2/dav/idav.py
===================================================================
---- twisted/web2/dav/idav.py (revision 18092)
-+++twisted/web2/dav/idav.py (working copy)
-@@ -187,6 +187,64 @@
+--- twisted/web2/dav/idav.py (revision 18157)
++++ twisted/web2/dav/idav.py (working copy)
+@@ -175,6 +175,64 @@
the specified principal.
"""
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/__init__.py
===================================================================
---- twisted/web2/dav/method/__init__.py (revision 18092)
+--- twisted/web2/dav/method/__init__.py (revision 18157)
+++ twisted/web2/dav/method/__init__.py (working copy)
@@ -40,6 +40,7 @@
"proppatch",
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/copymove.py
===================================================================
---- twisted/web2/dav/method/copymove.py (revision 18092)
+--- twisted/web2/dav/method/copymove.py (revision 18157)
+++ twisted/web2/dav/method/copymove.py (working copy)
@@ -37,7 +37,7 @@
from twisted.web2.http import HTTPError, StatusResponse
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/delete.py
===================================================================
---- twisted/web2/dav/method/delete.py (revision 18092)
+--- twisted/web2/dav/method/delete.py (revision 18157)
+++ twisted/web2/dav/method/delete.py (working copy)
@@ -58,8 +58,26 @@
yield x
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/put.py
===================================================================
---- twisted/web2/dav/method/put.py (revision 18092)
+--- twisted/web2/dav/method/put.py (revision 18157)
+++ twisted/web2/dav/method/put.py (working copy)
@@ -34,7 +34,7 @@
from twisted.web2 import responsecode
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put_common.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put_common.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.method.put_common.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -2,7 +2,7 @@
===================================================================
--- twisted/web2/dav/method/put_common.py (revision 0)
+++ twisted/web2/dav/method/put_common.py (revision 0)
-@@ -0,0 +1,229 @@
+@@ -0,0 +1,228 @@
+##
+# Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
+#
@@ -202,7 +202,6 @@
+ diff_size = new_dest_size - old_dest_size
+ if diff_size >= destquota[0]:
+ log.err("Over quota: available %d, need %d" % (destquota[0], diff_size))
-+ rollback.Rollback()
+ raise HTTPError(StatusResponse(responsecode.INSUFFICIENT_STORAGE_SPACE, "Over quota"))
+ d = waitForDeferred(destination.quotaSizeAdjust(request, diff_size))
+ yield d
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,8 +1,8 @@
Index: twisted/web2/dav/resource.py
===================================================================
---- twisted/web2/dav/resource.py (revision 18092)
+--- twisted/web2/dav/resource.py (revision 18157)
+++ twisted/web2/dav/resource.py (working copy)
-@@ -125,6 +125,8 @@
+@@ -126,6 +126,8 @@
(dav_namespace, "acl-restrictions" ), # RFC 3744, section 5.6
(dav_namespace, "inherited-acl-set" ), # RFC 3744, section 5.7
(dav_namespace, "principal-collection-set" ), # RFC 3744, section 5.8
@@ -44,16 +44,16 @@
if namespace == twisted_dav_namespace:
if name == "resource-class":
-@@ -599,7 +627,7 @@
+@@ -596,7 +624,7 @@
else:
factory = request.credentialFactories[authHeader[0]]
- creds = factory.decode(authHeader[1], request.method)
+ creds = factory.decode(authHeader[1], request)
- # Try to match principals in each principal collection on
- # the resource
-@@ -1526,6 +1554,219 @@
+ # Try to match principals in each principal collection on the resource
+ def gotDetails(details):
+@@ -1502,6 +1530,219 @@
return None
##
@@ -273,7 +273,7 @@
# HTTP
##
-@@ -1631,6 +1872,28 @@
+@@ -1736,6 +1977,28 @@
davxml.registerElement(TwistedAccessDisabledProperty)
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.static.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.static.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.dav.static.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/static.py
===================================================================
---- twisted/web2/dav/static.py (revision 18092)
+--- twisted/web2/dav/static.py (revision 18157)
+++ twisted/web2/dav/static.py (working copy)
@@ -29,6 +29,7 @@
__all__ = ["DAVFile"]
@@ -18,9 +18,9 @@
+from twisted.web2 import responsecode
from twisted.web2.dav import davxml
from twisted.web2.dav.idav import IDAVResource
- from twisted.web2.dav.resource import DAVResource
-@@ -145,6 +148,58 @@
- return succeed(DAVFile._supportedPrivilegeSet)
+ from twisted.web2.dav.resource import DAVResource, davPrivilegeSet
+@@ -98,6 +101,58 @@
+ return succeed(davPrivilegeSet)
##
+ # Quota
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.server.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.server.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/server.py
===================================================================
---- twisted/web2/server.py (revision 17932)
+--- twisted/web2/server.py (revision 18157)
+++ twisted/web2/server.py (working copy)
@@ -11,7 +11,7 @@
import cStringIO as StringIO
Modified: CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch 2006-09-15 02:42:38 UTC (rev 137)
+++ CalendarServer/branches/users/cdaboo/quota/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch 2006-09-15 03:40:47 UTC (rev 138)
@@ -1,6 +1,6 @@
Index: twisted/web2/test/test_httpauth.py
===================================================================
---- twisted/web2/test/test_httpauth.py (revision 17932)
+--- twisted/web2/test/test_httpauth.py (revision 18157)
+++ twisted/web2/test/test_httpauth.py (working copy)
@@ -2,6 +2,7 @@
from twisted.internet import defer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060914/87fc0140/attachment.html
More information about the calendarserver-changes
mailing list