diff options
Diffstat (limited to 'lib/simplepie')
| -rw-r--r-- | lib/simplepie/simplepie/src/File.php | 28 | ||||
| -rw-r--r-- | lib/simplepie/simplepie/src/HTTP/Parser.php | 2 |
2 files changed, 19 insertions, 11 deletions
diff --git a/lib/simplepie/simplepie/src/File.php b/lib/simplepie/simplepie/src/File.php index ef1dd5156..1fc2c7606 100644 --- a/lib/simplepie/simplepie/src/File.php +++ b/lib/simplepie/simplepie/src/File.php @@ -125,7 +125,6 @@ class File implements Response curl_setopt($fp, CURLOPT_ENCODING, ''); } curl_setopt($fp, CURLOPT_URL, $url); - curl_setopt($fp, CURLOPT_HEADER, 1); curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1); curl_setopt($fp, CURLOPT_FAILONERROR, 1); curl_setopt($fp, CURLOPT_TIMEOUT, $timeout); @@ -133,27 +132,37 @@ class File implements Response // curl_setopt($fp, CURLOPT_REFERER, \SimplePie\Misc::url_remove_credentials($url)); // FreshRSS removed curl_setopt($fp, CURLOPT_USERAGENT, $useragent); curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); + $responseHeaders = ''; + curl_setopt($fp, CURLOPT_HEADERFUNCTION, function ($ch, string $header) use (&$responseHeaders) { + if (trim($header) !== '') { // Skip e.g. separation with trailer headers + $responseHeaders .= $header; + } + return strlen($header); + }); foreach ($curl_options as $curl_param => $curl_value) { curl_setopt($fp, $curl_param, $curl_value); } - /** @var string|false $responseHeaders */ - $responseHeaders = curl_exec($fp); + /** @var string|false $responseBody */ + $responseBody = curl_exec($fp); + $responseHeaders .= "\r\n"; if (curl_errno($fp) === CURLE_WRITE_ERROR || curl_errno($fp) === CURLE_BAD_CONTENT_ENCODING) { $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); // FreshRSS - $this->on_http_response($responseHeaders); + $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody); $this->error = null; // FreshRSS curl_setopt($fp, CURLOPT_ENCODING, 'none'); - /** @var string|false $responseHeaders */ - $responseHeaders = curl_exec($fp); + $responseHeaders = ''; + /** @var string|false $responseBody */ + $responseBody = curl_exec($fp); + $responseHeaders .= "\r\n"; } $this->status_code = curl_getinfo($fp, CURLINFO_HTTP_CODE); if (curl_errno($fp)) { $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); $this->success = false; - $this->on_http_response($responseHeaders); + $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody); } else { - $this->on_http_response($responseHeaders); + $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody); // Use the updated url provided by curl_getinfo after any redirects. if ($info = curl_getinfo($fp)) { $this->url = $info['url']; @@ -167,8 +176,7 @@ class File implements Response $parser = new \SimplePie\HTTP\Parser($responseHeaders, true); if ($parser->parse()) { $this->set_headers($parser->headers); - $this->body = $parser->body; - $this->status_code = $parser->status_code; + $this->body = $responseBody === false ? null : $responseBody; if ((in_array($this->status_code, [300, 301, 302, 303, 307]) || $this->status_code > 307 && $this->status_code < 400) && ($locationHeader = $this->get_header_line('location')) !== '' && $this->redirects < $redirects) { $this->redirects++; $location = \SimplePie\Misc::absolutize_url($locationHeader, $url); diff --git a/lib/simplepie/simplepie/src/HTTP/Parser.php b/lib/simplepie/simplepie/src/HTTP/Parser.php index e9bcc4671..d329be1c2 100644 --- a/lib/simplepie/simplepie/src/HTTP/Parser.php +++ b/lib/simplepie/simplepie/src/HTTP/Parser.php @@ -42,7 +42,7 @@ class Parser /** * Key/value pairs of the headers * - * @var (Psr7Compatible is true ? array<string, non-empty-array<string>> : array<string, string>) + * @phpstan-var (Psr7Compatible is true ? array<string, non-empty-array<string>> : array<string, string>) */ public $headers = []; |