8000 [HttpClient] fix PHP warning + accept status code >= 600 by nicolas-grekas · Pull Request #36823 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpClient] fix PHP warning + accept status code >= 600 #36823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2020
Merged

[HttpClient] fix PHP warning + accept status code >= 600 #36823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
8000 Failed to load files.
Loading
Diff view
Diff view
[HttpClient] fix PHP warning + accept status code >= 600
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed May 15, 2020
commit c764b5c36e6043a5c3100b4d4780ae30bdebdec3
11 changes: 9 additions & 2 deletions src/Symfony/Component/HttpClient/Response/CurlResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,15 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
}

if ("\r\n" !== $data) {
// Regular header line: add it to the list
self::addResponseHeaders([substr($data, 0, -2)], $info, $headers);
try {
// Regular header line: add it to the list
self::addResponseHeaders([substr($data, 0, -2)], $info, $headers);
} catch (TransportException $e) {
$multi->handlesActivity[$id][] = null;
$multi->handlesActivity[$id][] = $e;

return \strlen($data);
}

if (0 !== strpos($data, 'HTTP/')) {
if (0 === stripos($data, 'Location:')) {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpClient/Response/ResponseTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ private static function initialize(self $response): void
private static function addResponseHeaders(array $responseHeaders, array &$info, array &$headers, string &$debug = ''): void
{
foreach ($responseHeaders as $h) {
if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d)(?: |$)#', $h, $m)) {
if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([1-9]\d\d)(?: |$)#', $h, $m)) {
if ($headers) {
$debug .= "< \r\n";
$headers = [];
Expand Down
0