diff options
| -rw-r--r-- | app/Models/Feed.php | 2 | ||||
| -rw-r--r-- | app/Utils/httpUtil.php | 2 | ||||
| -rwxr-xr-x | cli/health.php | 2 | ||||
| -rw-r--r-- | lib/composer.json | 2 | ||||
| -rw-r--r-- | lib/simplepie/simplepie/src/File.php | 10 |
5 files changed, 12 insertions, 6 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 19ff4fa81..511bdc54a 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -1415,7 +1415,7 @@ class FreshRSS_Feed extends Minz_Model { CURLOPT_USERAGENT => FRESHRSS_USERAGENT, CURLOPT_MAXREDIRS => 10, CURLOPT_FOLLOWLOCATION => true, - CURLOPT_ENCODING => '', //Enable all encodings + CURLOPT_ACCEPT_ENCODING => '', //Enable all encodings //CURLOPT_VERBOSE => 1, // To debug sent HTTP headers ]); $response = curl_exec($ch); diff --git a/app/Utils/httpUtil.php b/app/Utils/httpUtil.php index ba63f0dde..5b652b5f2 100644 --- a/app/Utils/httpUtil.php +++ b/app/Utils/httpUtil.php @@ -339,7 +339,7 @@ final class FreshRSS_http_Util { CURLOPT_MAXREDIRS => 4, CURLOPT_RETURNTRANSFER => true, CURLOPT_FOLLOWLOCATION => true, - CURLOPT_ENCODING => '', //Enable all encodings + CURLOPT_ACCEPT_ENCODING => '', //Enable all encodings //CURLOPT_VERBOSE => 1, // To debug sent HTTP headers ]); diff --git a/cli/health.php b/cli/health.php index c6a9c38b7..2e0687f0c 100755 --- a/cli/health.php +++ b/cli/health.php @@ -17,7 +17,7 @@ if ($ch === false) { curl_setopt_array($ch, [ CURLOPT_CONNECTTIMEOUT => is_numeric($options['connect_timeout'] ?? null) ? (int)$options['connect_timeout'] : 3, CURLOPT_TIMEOUT => is_numeric($options['timeout'] ?? null) ? (int)$options['timeout'] : 5, - CURLOPT_ENCODING => '', //Enable all encodings + CURLOPT_ACCEPT_ENCODING => '', //Enable all encodings CURLOPT_HTTPHEADER => [ 'Connection: close', ], diff --git a/lib/composer.json b/lib/composer.json index a68d768f2..727982e8b 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -14,7 +14,7 @@ "marienfressinaud/lib_opml": "0.5.1", "phpgt/cssxpath": "v1.4.0", "phpmailer/phpmailer": "7.0.1", - "simplepie/simplepie": "dev-freshrss#e7b26b4f01d377dc8174d5d4aee961604534d065" + "simplepie/simplepie": "dev-freshrss#02d08ffe43b7e93239f90f7d700475891cefcef8" }, "config": { "sort-packages": true, diff --git a/lib/simplepie/simplepie/src/File.php b/lib/simplepie/simplepie/src/File.php index 0981ebf96..a5396e576 100644 --- a/lib/simplepie/simplepie/src/File.php +++ b/lib/simplepie/simplepie/src/File.php @@ -121,7 +121,9 @@ class File implements Response } unset($curl_options[CURLOPT_HTTPHEADER]); } - if (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) { + if (version_compare(\SimplePie\Misc::get_curl_version(), '7.21.6', '>=')) { + curl_setopt($fp, CURLOPT_ACCEPT_ENCODING, ''); + } elseif (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) { curl_setopt($fp, CURLOPT_ENCODING, ''); } curl_setopt($fp, CURLOPT_URL, $url); @@ -147,7 +149,11 @@ class File implements Response $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); // FreshRSS $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody, $curl_options); $this->error = null; // FreshRSS - curl_setopt($fp, CURLOPT_ENCODING, 'none'); + if (version_compare(\SimplePie\Misc::get_curl_version(), '7.21.6', '>=')) { + curl_setopt($fp, CURLOPT_ACCEPT_ENCODING, null); + } else { + curl_setopt($fp, CURLOPT_ENCODING, null); + } $responseHeaders = ''; $responseBody = curl_exec($fp); $responseHeaders .= "\r\n"; |