We don't generate relative URLs anymore, and we support parameters without

values. All tests pass.

diff --git a/framework/Core/test/Horde/Core/UrlTest.php b/framework/Core/test/Horde/Core/UrlTest.php
index 8d35179..a740bbd 100644 (file)
--- a/framework/Core/test/Horde/Core/UrlTest.php
+++ b/framework/Core/test/Horde/Core/UrlTest.php
@@ -12,246 +12,246 @@ class Horde_Core_UrlTest extends PHPUnit_Framework_TestCase
     public function testUrl()
     {
         $expected = array(
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
-            'test.php',
-            'test.php?PHPSESSID=',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php',
+            '/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com:443/hordeurl/test.php',
-            'http://example.com:443/hordeurl/test.php?PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?PHPSESSID',
             'http://example.com:443/hordeurl/test.php',
-            'http://example.com:443/hordeurl/test.php?PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?PHPSESSID',
             'https://example.com:80/hordeurl/test.php',
-            'https://example.com:80/hordeurl/test.php?PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?PHPSESSID',
             'https://example.com:80/hordeurl/test.php',
-            'https://example.com:80/hordeurl/test.php?PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?PHPSESSID',
             'https://example.com/hordeurl/test.php',
-            'https://example.com/hordeurl/test.php?PHPSESSID=',
+            'https://example.com/hordeurl/test.php?PHPSESSID',
             'https://example.com/hordeurl/test.php',
-            'https://example.com/hordeurl/test.php?PHPSESSID=',
+            'https://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
             'http://example.com/hordeurl/test.php',
-            'http://example.com/hordeurl/test.php?PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1',
-            'test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1',
+            '/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1',
-            'http://example.com:443/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1',
-            'http://example.com:443/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1',
-            'https://example.com:80/hordeurl/test.php?foo=1&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1',
-            'https://example.com:80/hordeurl/test.php?foo=1&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1',
-            'https://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1',
-            'https://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1',
-            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2',
-            'test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2',
+            '/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
-            'test.php?foo=1&bar=2&baz=3',
-            'test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3',
+            '/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com:443/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'https://example.com:80/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'https://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
             'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3',
-            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID=',
+            'http://example.com/hordeurl/test.php?foo=1&bar=2&baz=3&PHPSESSID',
         );
 
         $uris = array(