From: Gaetano Giunta Date: Tue, 15 Feb 2022 17:54:40 +0000 (+0100) Subject: Merge pull request #96 from duzun/patch-1 X-Git-Tag: plcapi-7.1-0~3^2~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4bb1a0101458c40cfaf389b582ffaac91819addb;hp=5f47934cdf3c7d989ab4c5a11d9c08d1d55a8380;p=plcapi.git Merge pull request #96 from duzun/patch-1 HTTP/2 support --- diff --git a/src/Helper/Http.php b/src/Helper/Http.php index 3c65ffa..77d4a9d 100644 --- a/src/Helper/Http.php +++ b/src/Helper/Http.php @@ -115,13 +115,13 @@ class Http // When using Curl to query servers using Digest Auth, we get back a double set of http headers. // We strip out the 1st... - if ($headersProcessed && preg_match('/^HTTP\/[0-9]\.[0-9] 401 /', $data)) { - if (preg_match('/(\r?\n){2}HTTP\/[0-9]\.[0-9] 200 /', $data)) { - $data = preg_replace('/^HTTP\/[0-9]\.[0-9] 401 .+?(?:\r?\n){2}(HTTP\/[0-9.]+ 200 )/s', '$1', $data, 1); + if ($headersProcessed && preg_match('/^HTTP\/[0-9](?:\.[0-9])? 401 /', $data)) { + if (preg_match('/(\r?\n){2}HTTP\/[0-9](?:\.[0-9])? 200 /', $data)) { + $data = preg_replace('/^HTTP\/[0-9](?:\.[0-9])? 401 .+?(?:\r?\n){2}(HTTP\/[0-9.]+ 200 )/s', '$1', $data, 1); } } - if (preg_match('/^HTTP\/[0-9]\.[0-9] ([0-9]{3}) /', $data, $matches)) { + if (preg_match('/^HTTP\/[0-9](?:\.[0-9])? ([0-9]{3}) /', $data, $matches)) { $httpResponse['status_code'] = $matches[1]; }