Commit0b2645d

committed

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

1 parent9bcf9c1 commit0b2645dCopy full SHA for 0b2645d

File tree

+11

-3

lines changed

src/Symfony/Component/HttpClient/Response
- CurlResponse.php
- ResponseTrait.php

+11

-3

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,16 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`if ("\r\n" !==$data) {`
`315`		`-// Regular header line: add it to the list`
`316`		`-self::addResponseHeaders([substr($data,0, -2)],$info,$headers);`
	`315`	`+try {`
	`316`	`+// Regular header line: add it to the list`
	`317`	`+self::addResponseHeaders([substr($data,0, -2)],$info,$headers);`
	`318`	`+ }catch (TransportException$e) {`
	`319`	`+$multi->handlesActivity[$id][] =null;`
	`320`	`+$multi->handlesActivity[$id][] =$e;`
	`321`	`+`
	`322`	`+return\strlen($data);`
	`323`	`+ }`
	`324`	`+`
`317`	`325`
`318`	`326`	`if (0 !==strpos($data,'HTTP/')) {`
`319`	`327`	`if (0 ===stripos($data,'Location:')) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private static function initialize(self $response): void`
`253`	`253`	`privatestaticfunctionaddResponseHeaders(array$responseHeaders,array &$info,array &$headers,string &$debug =''):void`
`254`	`254`	`{`
`255`	`255`	`foreach ($responseHeadersas$h) {`
`256`		`-if (11 <=\strlen($h) &&'/' ===$h[4] &&preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d)(?: \|$)#',$h,$m)) {`
	`256`	`+if (11 <=\strlen($h) &&'/' ===$h[4] &&preg_match('#^HTTP/\d+(?:\.\d+)? ([123456789]\d\d)(?: \|$)#',$h,$m)) {`
`257`	`257`	`if ($headers) {`
`258`	`258`	`$debug .="<\r\n";`
`259`	`259`	`$headers = [];`

Comments

(0)