[CalendarServer-changes] [1788] CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/ Twisted

[source_changes at macosforge.org]

Revision: 1788
          http://trac.macosforge.org/projects/calendarserver/changeset/1788
Author:   wsanchez at apple.com
Date:     2007-08-14 14:54:54 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Pulled up r1787 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.element.base.patch
    CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.element.base.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.element.base.patch	2007-08-13 18:58:11 UTC (rev 1787)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.element.base.patch	2007-08-14 21:54:54 UTC (rev 1788)
@@ -208,15 +208,15 @@
 +        # Do escaping/CDATA behavior
 +        if "\r" in self.data or "\n" in self.data:
 +            # Do CDATA
-+            cdata = "<![CDATA[%s]]>" % (self.data.replace("]]>", "]]&lt;"),)
++            cdata = "<![CDATA[%s]]>" % (self.data.replace("]]>", "]]&gt;"),)
 +        else:
 +            cdata = self.data
 +            if "&" in cdata:
 +                cdata = cdata.replace("&", "&amp;")
 +            if "<" in cdata:
-+                cdata = cdata.replace("&", "&lt;")
-+            if "]]>" in cdata:
-+                cdata = cdata.replace("]]>", "]]&lt;")
++                cdata = cdata.replace("<", "&lt;")
++            if ">" in cdata:
++                cdata = cdata.replace(">", "&gt;")
 +
 +        output.write(cdata)
 +

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch	2007-08-13 18:58:11 UTC (rev 1787)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch	2007-08-14 21:54:54 UTC (rev 1788)
@@ -31,17 +31,29 @@
          return r
  
      def _decode(clazz, name):
-@@ -109,7 +104,16 @@
-         return doc.root_element
+@@ -104,12 +99,26 @@
+                 "No such property: {%s}%s" % qname
+             ))
  
+-        doc = davxml.WebDAVDocument.fromString(value)
++        try:
++            doc = davxml.WebDAVDocument.fromString(value)
+ 
+-        return doc.root_element
++            return doc.root_element
++        except ValueError:
++            msg = "Invalid property value stored on server: {%s}%s %s" % (qname[0], qname[1], value)
++            log.err(msg)
++            raise HTTPError(StatusResponse(responsecode.INTERNAL_SERVER_ERROR, msg))
+ 
      def set(self, property):
 -        self.attrs[self._encode(property.qname())] = property.toxml()
 +        for n in range(20):
 +            try:
 +                self.attrs[self._encode(property.qname())] = property.toxml()
 +            except IOError, error:
-+		if error.errno != EAGAIN:
-+		    raise
++                if error.errno != EAGAIN:
++                    raise
 +                sleep(random() / 10) # OMG Brutal Hax
 +            else:
 +                break

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