zopedoctest no longer breaks if the URL contains more than one question mark....

zopedoctest no longer breaks if the URL contains more than one question mark. It broke even when the second question mark was correctly quoted.

doc/CHANGES.txt

@@ -454,6 +454,10 @@ Zope Changes
       - Prevent ZPublisher from insering incorrect <base/> tags into the
         headers of plain html files served from Zope3 resource directories.
 
+      - zopedoctest no longer breaks if the URL contains more than one
+        question mark. It broke even when the second question mark was
+        correctly quoted.
+
     Other Changes
 
       - Disabled docutils file inclusion completely, rather than trying

lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt

@@ -116,6 +116,17 @@ Test Server Error
   HTTP/1.1 500 Internal Server Error
   ...Content-Type: text/html...TypeError...
 
+Test parameter containing an additional '?'
+
+  >>> print http(r"""
+  ... GET /test_folder_1_?foo=bla%3Fbaz HTTP/1.1
+  ... """)
+  HTTP/1.1 200 OK
+  Content-Length: 5
+  Content-Type: text/plain; charset=iso-8859-15
+  <BLANKLINE>
+  index
+              
 Test Unauthorized
 
   >>> self.folder.index_html.manage_permission('View', ['Owner'])

lib/python/Testing/ZopeTestCase/zopedoctest/functional.py

@@ -144,7 +144,7 @@ def http(request_string, handle_errors=True):
            "SERVER_PROTOCOL": protocol,
            }
 
-    p = path.split('?')
+    p = path.split('?', 1)
     if len(p) == 1:
         env['PATH_INFO'] = p[0]
     elif len(p) == 2: