valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/php-7.4-stuff

This commit is contained in:
wn_ 2022-08-15 10:43:14 +00:00
parent c301053965 7d77edd1fb
commit 0dbed700ef
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
classes/urlhelper.php
View File

@ -439,7 +439,11 @@ class UrlHelper {
} }
if (!$contents) { if (!$contents) {
self::$fetch_last_error = curl_errno($ch) . " " . curl_error($ch); if (curl_errno($ch) === 0) {
self::$fetch_last_error = 'Successful response, but no content was received.';
} else {
self::$fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
}
curl_close($ch); curl_close($ch);
return false; return false;
} }
@ -520,6 +524,11 @@ class UrlHelper {
$data = @file_get_contents($url, false, $context); $data = @file_get_contents($url, false, $context);
if ($data === false) {
self::$fetch_last_error = "'file_get_contents' failed.";
return false;
}
foreach ($http_response_header as $header) { foreach ($http_response_header as $header) {
if (strstr($header, ": ") !== false) { if (strstr($header, ": ") !== false) {
list ($key, $value) = explode(": ", $header); list ($key, $value) = explode(": ", $header);
@ -555,15 +564,20 @@ class UrlHelper {
return false; return false;
} }
$is_gzipped = RSSUtils::is_gzipped($data); if ($data) {
$is_gzipped = RSSUtils::is_gzipped($data);
if ($is_gzipped && $data) { if ($is_gzipped) {
$tmp = @gzdecode($data); $tmp = @gzdecode($data);
if ($tmp) $data = $tmp; if ($tmp) $data = $tmp;
}
return $data;
} else {
self::$fetch_last_error = 'Successful response, but no content was received.';
return false;
} }
return $data;
} }
} }