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

Clean up UrlHelper::resolve_redirects(). 

Also: this doesn't appear to be used... but maybe in some plugin?
This commit is contained in:
wn_ 2023-12-23 15:48:02 +00:00
parent ff59fbd460
commit d82da74363
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/UrlHelper.php
View File

@ -205,15 +205,15 @@ class UrlHelper {
$response = $client->request('HEAD', $url, [ $response = $client->request('HEAD', $url, [
GuzzleHttp\RequestOptions::CONNECT_TIMEOUT => $timeout ?: Config::get(Config::FILE_FETCH_CONNECT_TIMEOUT), GuzzleHttp\RequestOptions::CONNECT_TIMEOUT => $timeout ?: Config::get(Config::FILE_FETCH_CONNECT_TIMEOUT),
GuzzleHttp\RequestOptions::TIMEOUT => $timeout ?: Config::get(Config::FILE_FETCH_TIMEOUT), GuzzleHttp\RequestOptions::TIMEOUT => $timeout ?: Config::get(Config::FILE_FETCH_TIMEOUT),
GuzzleHttp\RequestOptions::ALLOW_REDIRECTS => ['max' => 10, 'track_redirects' => true, 'http_errors' => false], GuzzleHttp\RequestOptions::ALLOW_REDIRECTS => ['max' => 10, 'track_redirects' => true],
GuzzleHttp\RequestOptions::HTTP_ERRORS => false,
GuzzleHttp\RequestOptions::HEADERS => [ GuzzleHttp\RequestOptions::HEADERS => [
'User-Agent' => Config::get_user_agent(), 'User-Agent' => Config::get_user_agent(),
'Connection' => 'close', 'Connection' => 'close',
], ],
]); ]);
} catch (GuzzleHttp\Exception\GuzzleException $ex) { } catch (Exception $ex) {
// TODO: catch just the "too many redirects" exception, and set a different 'error' for general issues $span->setAttribute('error', (string) $ex);
$span->setAttribute('error', 'too many redirects');
$span->end(); $span->end();
return false; return false;
} }