Merge branch '6.4' into 7.3

* 6.4:
  [HttpClient] Reject 3xx pushed responses
  [ProxyManagerBridge] Remove comment that reference github discussion
  [Routing] Fix matching the "0" URL
  The BrowserKit history with parameter separator without slash.

Author: nicolas-grekas

AbstractBrowser.php

@@ -661,7 +661,7 @@ protected function getAbsoluteUri(string $uri): string
             $uri = $path.$uri;
         }
 
-        return preg_replace('#^(.*?//[^/]+)\/.*$#', '$1', $currentUri).$uri;
+        return preg_replace('#^(.*?//[^/?]+)[/?].*$#', '$1', $currentUri).$uri;
     }
 
     /**

Tests/AbstractBrowserTest.php

@@ -891,6 +891,15 @@ public function testInternalRequestNull()
         $client->getInternalRequest();
     }
 
+    public function testHistoryWithParametersAndNoSlash()
+    {
+        $client = $this->getBrowser();
+        $client->request('GET', 'https://www.example.com?the=value');
+        $client->request('GET', '/path/?parameter=value');
+
+        $this->assertSame('https://www.example.com/path/?parameter=value', $client->getRequest()->getUri(), '->request() history provides proper base.');
+    }
+
     public function testFollowRedirectWithoutRequest()
     {
         $browser = $this->getBrowser();