[HttpClient] bugfix exploding values of headers
This commit is contained in:
parent
2c2d2ac3a7
commit
5cd8895c67
@ -77,17 +77,20 @@ class CachingHttpClient implements HttpClientInterface
|
|||||||
$request = Request::create($url, $method);
|
$request = Request::create($url, $method);
|
||||||
$request->attributes->set('http_client_options', $options);
|
$request->attributes->set('http_client_options', $options);
|
||||||
|
|
||||||
foreach ($options['headers'] as $name => $values) {
|
foreach ($options['normalized_headers'] as $name => $values) {
|
||||||
if ('cookie' !== $name) {
|
if ('cookie' !== $name) {
|
||||||
$request->headers->set($name, $values);
|
foreach ($values as $value) {
|
||||||
|
$request->headers->set($name, substr($value, 2 + \strlen($name)), false);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($values as $cookies) {
|
foreach ($values as $cookies) {
|
||||||
foreach (explode('; ', $cookies) as $cookie) {
|
foreach (explode('; ', substr($cookies, \strlen('Cookie: '))) as $cookie) {
|
||||||
if ('' !== $cookie) {
|
if ('' !== $cookie) {
|
||||||
$cookie = explode('=', $cookie, 2);
|
$cookie = explode('=', $cookie, 2);
|
||||||
$request->cookies->set($cookie[0], $cookie[1] ?? null);
|
$request->cookies->set($cookie[0], $cookie[1] ?? '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -196,10 +196,21 @@ trait HttpClientTrait
|
|||||||
$normalizedHeaders = [];
|
$normalizedHeaders = [];
|
||||||
|
|
||||||
foreach ($headers as $name => $values) {
|
foreach ($headers as $name => $values) {
|
||||||
|
if (\is_object($values) && method_exists('__toString')) {
|
||||||
|
$values = (string) $values;
|
||||||
|
}
|
||||||
|
|
||||||
if (\is_int($name)) {
|
if (\is_int($name)) {
|
||||||
|
if (!\is_string($values)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \gettype($values)));
|
||||||
|
}
|
||||||
[$name, $values] = explode(':', $values, 2);
|
[$name, $values] = explode(':', $values, 2);
|
||||||
$values = [ltrim($values)];
|
$values = [ltrim($values)];
|
||||||
} elseif (!is_iterable($values)) {
|
} elseif (!is_iterable($values)) {
|
||||||
|
if (\is_object($values)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \get_class($values)));
|
||||||
|
}
|
||||||
|
|
||||||
$values = (array) $values;
|
$values = (array) $values;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\HttpClient\Tests;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Symfony\Component\HttpClient\CachingHttpClient;
|
||||||
|
use Symfony\Component\HttpClient\MockHttpClient;
|
||||||
|
use Symfony\Component\HttpClient\Response\MockResponse;
|
||||||
|
use Symfony\Component\HttpKernel\HttpCache\Store;
|
||||||
|
|
||||||
|
class CachingHttpClientTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testRequestHeaders()
|
||||||
|
{
|
||||||
|
$options = [
|
||||||
|
'headers' => [
|
||||||
|
'Application-Name' => 'test1234',
|
||||||
|
'Test-Name-Header' => 'test12345',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
$mockClient = new MockHttpClient();
|
||||||
|
$store = new Store(sys_get_temp_dir().'/sf_http_cache');
|
||||||
|
$client = new CachingHttpClient($mockClient, $store, $options);
|
||||||
|
|
||||||
|
$response = $client->request('GET', 'http://example.com/foo-bar');
|
||||||
|
|
||||||
|
rmdir(sys_get_temp_dir().'/sf_http_cache');
|
||||||
|
self::assertInstanceOf(MockResponse::class, $response);
|
||||||
|
self::assertSame($response->getRequestOptions()['normalized_headers']['application-name'][0], 'Application-Name: test1234');
|
||||||
|
self::assertSame($response->getRequestOptions()['normalized_headers']['test-name-header'][0], 'Test-Name-Header: test12345');
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user