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

fix previous re: resolve_redirects

This commit is contained in:
Andrew Dolgov 2020-09-22 09:18:24 +03:00
parent 74568df4ff
commit ab6aa0ad3e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/urlhelper.php
View File

@ -120,7 +120,7 @@ class UrlHelper {
if (stripos($header, 'Location:') === 0) { if (stripos($header, 'Location:') === 0) {
$url = UrlHelper::rewrite_relative($url, trim(substr($header, strlen('Location:')))); $url = UrlHelper::rewrite_relative($url, trim(substr($header, strlen('Location:'))));
return resolve_redirects($url, $timeout, $nest + 1); return UrlHelper::resolve_redirects($url, $timeout, $nest + 1);
} }
} }
@ -404,7 +404,7 @@ class UrlHelper {
$old_error = error_get_last(); $old_error = error_get_last();
$fetch_effective_url = resolve_redirects($url, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT); $fetch_effective_url = UrlHelper::resolve_redirects($url, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
if (!UrlHelper::validate($fetch_effective_url, true)) { if (!UrlHelper::validate($fetch_effective_url, true)) {
$fetch_last_error = "URL received after redirection failed extended validation."; $fetch_last_error = "URL received after redirection failed extended validation.";