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

Merge pull request 'Fix xml parsing error' (#70) from Sie/tt-rss:parsing-fix into master 

Reviewed-on: https://dev.tt-rss.org/fox/tt-rss/pulls/70
This commit is contained in:
fox 2022-05-22 12:34:45 +03:00
parent 659ad8537a 3406a16025
commit 1152b2454e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/urlhelper.php
View File

@ -394,6 +394,11 @@ class UrlHelper {
$ret = @curl_exec($ch); $ret = @curl_exec($ch);
if (curl_errno($ch) === 23 || curl_errno($ch) === 61) {
curl_setopt($ch, CURLOPT_ENCODING, 'none');
$ret = @curl_exec($ch);
}
$headers_length = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headers_length = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
$headers = explode("\r\n", substr($ret, 0, $headers_length)); $headers = explode("\r\n", substr($ret, 0, $headers_length));
$contents = substr($ret, $headers_length); $contents = substr($ret, $headers_length);
@ -413,11 +418,6 @@ class UrlHelper {
} }
} }
if (curl_errno($ch) === 23 || curl_errno($ch) === 61) {
curl_setopt($ch, CURLOPT_ENCODING, 'none');
$contents = @curl_exec($ch);
}
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
self::$fetch_last_content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); self::$fetch_last_content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);