[CalendarServer-changes] [2315] CalendarServer/branches/release/CalendarServer-1.3-dev/lib-patches/ Twisted/twisted.web2.dav.resource.patch

[source_changes at macosforge.org]

Revision: 2315
          http://trac.macosforge.org/projects/calendarserver/changeset/2315
Author:   wsanchez at apple.com
Date:     2008-04-15 11:33:34 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
Pull up r2311: don't log all requests in renderHTTP()

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.3-dev/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.3-dev/lib-patches/Twisted/twisted.web2.dav.resource.patch	2008-04-15 18:30:19 UTC (rev 2314)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/lib-patches/Twisted/twisted.web2.dav.resource.patch	2008-04-15 18:33:34 UTC (rev 2315)
@@ -853,7 +853,18 @@
      # HTTP
      ##
  
-@@ -1567,7 +1916,7 @@
+@@ -1525,10 +1874,6 @@
+         #litmus = request.headers.getRawHeaders("x-litmus")
+         #if litmus: log.msg("*** Litmus test: %s ***" % (litmus,))
+ 
+-        # FIXME: Learn how to use twisted logging facility, wsanchez
+-        protocol = "HTTP/%s.%s" % request.clientproto
+-        log.msg("%s %s %s" % (request.method, urllib.unquote(request.uri), protocol))
+-
+         #
+         # If this is a collection and the URI doesn't end in "/", redirect.
+         #
+@@ -1567,7 +1912,7 @@
      def findChildren(self, depth, request, callback, privileges=None, inherited_aces=None):
          return succeed(None)
  
@@ -862,7 +873,7 @@
      """
      Resource representing a WebDAV principal.  (RFC 3744, section 2)
      """
-@@ -1577,7 +1926,7 @@
+@@ -1577,7 +1922,7 @@
      # WebDAV
      ##
  
@@ -871,7 +882,7 @@
          (dav_namespace, "alternate-URI-set"),
          (dav_namespace, "principal-URL"    ),
          (dav_namespace, "group-member-set" ),
-@@ -1585,14 +1934,11 @@
+@@ -1585,14 +1930,11 @@
      )
  
      def davComplianceClasses(self):
@@ -887,7 +898,7 @@
      def readProperty(self, property, request):
          def defer():
              if type(property) is tuple:
-@@ -1610,10 +1956,10 @@
+@@ -1610,10 +1952,10 @@
                      return davxml.PrincipalURL(davxml.HRef(self.principalURL()))
  
                  if name == "group-member-set":
@@ -900,7 +911,7 @@
  
                  if name == "resourcetype":
                      if self.isCollection():
-@@ -1677,8 +2023,27 @@
+@@ -1677,8 +2019,27 @@
          if self.principalURL() == uri:
              return True
          else:
@@ -929,7 +940,7 @@
  class AccessDeniedError(Exception):
      def __init__(self, errors):
          """ 
-@@ -1718,6 +2083,37 @@
+@@ -1718,6 +2079,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/20080415/12a6470c/attachment.html