[CalendarServer-changes] [14023] CalDAVTester/trunk/src/request.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Sep 30 03:55:58 PDT 2014


Revision: 14023
          http://trac.calendarserver.org//changeset/14023
Author:   cdaboo at apple.com
Date:     2014-09-30 03:55:58 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
Sometimes ** and ## are legit in a URI as part of a query parameter.

Modified Paths:
--------------
    CalDAVTester/trunk/src/request.py

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2014-09-30 08:39:00 UTC (rev 14022)
+++ CalDAVTester/trunk/src/request.py	2014-09-30 10:55:58 UTC (rev 14023)
@@ -185,9 +185,11 @@
     def getURI(self, si):
         uri = si.extrasubs(self.ruri)
         if "**" in uri:
-            uri = uri.replace("**", str(uuid.uuid4()))
+            if "?" not in uri or uri.find("?") > uri.find("**"):
+                uri = uri.replace("**", str(uuid.uuid4()))
         elif "##" in uri:
-            uri = uri.replace("##", str(self.count))
+            if "?" not in uri or uri.find("?") > uri.find("##"):
+                uri = uri.replace("##", str(self.count))
         return uri
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140930/5a9e9b72/attachment.html>


More information about the calendarserver-changes mailing list