mirrors/rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2024-10-22 19:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: bug in cloudflare response detection

Browse source 
The cloudflare server header was not recognized in
some cases such as when the server header is "server"
or when the header value is "Cloudflare".
This commit is contained in:
Dag 2022-03-24 01:25:09 +01:00 committed by Eugene Molotov
parent 7bdc53125c
commit 384790537b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/contents.php
View file

@ -228,6 +228,8 @@ function getContents($url, $header = array(), $opts = array(), $returnHeader = f
curl_close($ch);
}
$finalHeader = array_change_key_case($finalHeader, CASE_LOWER);
switch($errorCode) {
case 200: // Contents OK
case 201: // Contents Created
@ -236,7 +238,7 @@ function getContents($url, $header = array(), $opts = array(), $returnHeader = f
$data = substr($data, $headerSize);
// Disable caching if the server responds with "Cache-Control: no-cache"
// or "Cache-Control: no-store"
$finalHeader = array_change_key_case($finalHeader, CASE_LOWER);
if(array_key_exists('cache-control', $finalHeader)) {
Debug::log('Server responded with "Cache-Control" header');
$directives = explode(',', $finalHeader['cache-control']);
@ -257,7 +259,7 @@ function getContents($url, $header = array(), $opts = array(), $returnHeader = f
$retVal['content'] = $cache->loadData();
break;
default:
if(array_key_exists('Server', $finalHeader) && strpos($finalHeader['Server'], 'cloudflare') !== false) {
if(array_key_exists('server', $finalHeader) && stripos($finalHeader['server'], 'cloudflare') !== false) {
throw new CloudflareChallengeException($errorCode);
}