bug #35324 [HttpClient] Fix strict parsing of response status codes (Armando-Walmeric)

nicolas-grekas · nicolas-grekas · commit ec0333c081fd · 2020-01-13T18:23:15.000+01:00
This PR was submitted for the master branch but it was squashed and merged into the 4.3 branch instead. Discussion ---------- [HttpClient] Fix strict parsing of response status codes | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | No ticket opened | License | MIT | Doc PR | No new feature If you wait a strict Http code response by the server were you request, but the server response isn't strict and only return HTTP/1.1 200 we have a problem without sense to be strict on regular expression. Commits ------- 4aa9536 [HttpClient] Fix strict parsing of response status codes
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -223,7 +223,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+)? ([12345]\d\d)(?: |$)#', $h, $m)) {
                 if ($headers) {
                     $debug .= "< \r\n";
                     $headers = [];

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ private static function initialize(self $response): void`
`223`	`223`	`private static function addResponseHeaders(array $responseHeaders, array &$info, array &$headers, string &$debug = ''): void`
`224`	`224`	`{`
`225`	`225`	`foreach ($responseHeaders as $h) {`
`226`		`- if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d) .*#', $h, $m)) {`
	`226`	`+ if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? ([12345]\d\d)(?: \|$)#', $h, $m)) {`
`227`	`227`	`if ($headers) {`
`228`	`228`	`$debug .= "< \r\n";`
`229`	`229`	`$headers = [];`