Merge pull request zendframework/zendframework#2830 branch 'hotfix/url-in-query'

Author: Maks3w

src/PhpEnvironment/Request.php

@@ -439,7 +439,7 @@ protected function detectRequestUri()
         }
 
         if ($requestUri !== null) {
-            return preg_replace('#^[^:]+://[^/]+#', '', $requestUri);
+            return preg_replace('#^[^/:]+://[^/]+#', '', $requestUri);
         }
 
         // IIS 5.0, PHP as CGI.

test/PhpEnvironment/RequestTest.php

@@ -204,6 +204,17 @@ public static function baseUrlAndPathProvider()
                 '/html/index.php',
                 '/html'
             ),
+
+            //Test when url quert contains a full http url
+            array(
+                array(
+                    'REQUEST_URI' => '/html/index.php?url=http://test.example.com/path/&foo=bar',
+                    'PHP_SELF' => '/html/index.php',
+                    'SCRIPT_FILENAME' => '/var/web/html/index.php',
+                ),
+                '/html/index.php',
+                '/html'
+            ),
         );
     }
 
@@ -357,6 +368,18 @@ public static function serverHostnameProvider()
                 '443',
                 '/news',
             ),
+
+            //Test when url quert contains a full http url
+            array(
+                array(
+                    'SERVER_NAME' => 'test.example.com',
+                    'REQUEST_URI' => '/html/index.php?url=http://test.example.com/path/&foo=bar',
+                ),
+                'test.example.com',
+                '80',
+                '/html/index.php?url=http://test.example.com/path/&foo=bar',
+            ),
+
         );
     }