Update website
This commit is contained in:
parent
0a686aeb9a
commit
c4ffa0f6ee
4360 changed files with 1727 additions and 718385 deletions
11
vendor/symfony/http-client/CurlHttpClient.php
vendored
11
vendor/symfony/http-client/CurlHttpClient.php
vendored
|
@ -274,7 +274,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
|
|||
if (file_exists($options['bindto'])) {
|
||||
$curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
|
||||
} elseif (!str_starts_with($options['bindto'], 'if!') && preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
|
||||
$curlopts[\CURLOPT_INTERFACE] = $matches[1];
|
||||
$curlopts[\CURLOPT_INTERFACE] = trim($matches[1], '[]');
|
||||
$curlopts[\CURLOPT_LOCALPORT] = $matches[2];
|
||||
} else {
|
||||
$curlopts[\CURLOPT_INTERFACE] = $options['bindto'];
|
||||
|
@ -424,6 +424,8 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
|
|||
return static function ($ch, string $location, bool $noContent) use (&$redirectHeaders, $options) {
|
||||
try {
|
||||
$location = self::parseUrl($location);
|
||||
$url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
|
||||
$url = self::resolveUrl($location, $url);
|
||||
} catch (InvalidArgumentException $e) {
|
||||
return null;
|
||||
}
|
||||
|
@ -436,16 +438,13 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
|
|||
$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
|
||||
}
|
||||
|
||||
if ($redirectHeaders && $host = parse_url('http:'.$location['authority'], \PHP_URL_HOST)) {
|
||||
$requestHeaders = $redirectHeaders['host'] === $host ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];
|
||||
if ($redirectHeaders && isset($location['authority'])) {
|
||||
$requestHeaders = parse_url($location['authority'], \PHP_URL_HOST) === $redirectHeaders['host'] ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];
|
||||
curl_setopt($ch, \CURLOPT_HTTPHEADER, $requestHeaders);
|
||||
} elseif ($noContent && $redirectHeaders) {
|
||||
curl_setopt($ch, \CURLOPT_HTTPHEADER, $redirectHeaders['with_auth']);
|
||||
}
|
||||
|
||||
$url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
|
||||
$url = self::resolveUrl($location, $url);
|
||||
|
||||
curl_setopt($ch, \CURLOPT_PROXY, self::getProxyUrl($options['proxy'], $url));
|
||||
|
||||
return implode('', $url);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue