diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
index a55d011953086..ea60fd4c47742 100644
--- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php
+++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
@@ -57,6 +57,7 @@ public static function forBaseUri(HttpClientInterface $client, string $baseUri,
*/
public function request(string $method, string $url, array $options = []): ResponseInterface
{
+ $e = null;
$url = self::parseUrl($url, $options['query'] ?? []);
if (\is_string($options['base_uri'] ?? null)) {
@@ -70,13 +71,18 @@ public function request(string $method, string $url, array $options = []): Respo
throw $e;
}
- [$url, $options] = self::prepareRequest($method, implode('', $url), $options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
- $url = implode('', $url);
+ $options = self::mergeDefaultOptions($options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
+ if (\is_string($options['base_uri'] ?? null)) {
+ $options['base_uri'] = self::parseUrl($options['base_uri']);
+ }
+ $url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null));
}
foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {
if (preg_match("{{$regexp}}A", $url)) {
- $options = self::mergeDefaultOptions($options, $defaultOptions, true);
+ if (null === $e || $regexp !== $this->defaultRegexp) {
+ $options = self::mergeDefaultOptions($options, $defaultOptions, true);
+ }
break;
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy