diff options
| author | 2016-04-22 14:05:03 +0200 | |
|---|---|---|
| committer | 2016-04-22 14:05:03 +0200 | |
| commit | 70c842031f01422c29fb179610aaf856d92e807c (patch) | |
| tree | 99d075ffb4e41fbc9a1bcab0c2e76eadfd6f8b7d /p/api/greader.php | |
| parent | 88be296cb2afb53b660b8d52943847cbccb09791 (diff) | |
| parent | 4862652585da1d69d62914659011c53146b21c17 (diff) | |
Merge branch 'FreshRSS/dev' into dev
Diffstat (limited to 'p/api/greader.php')
| -rw-r--r-- | p/api/greader.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/p/api/greader.php b/p/api/greader.php index 62782ce1a..894c2e960 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -46,6 +46,8 @@ function headerVariable($headerName, $varName) { $upName = 'HTTP_' . strtoupper($headerName); if (isset($_SERVER[$upName])) { $header = $_SERVER[$upName]; + } elseif (isset($_SERVER['REDIRECT_' . $upName])) { + $header = $_SERVER['REDIRECT_' . $upName]; } elseif (function_exists('getallheaders')) { $ALL_HEADERS = getallheaders(); if (isset($ALL_HEADERS[$headerName])) { @@ -134,6 +136,7 @@ function checkCompatibility() { die('FAIL 64-bit or GMP extension!'); } if ((!array_key_exists('HTTP_AUTHORIZATION', $_SERVER)) && //Apache mod_rewrite trick should be fine + (!array_key_exists('REDIRECT_HTTP_AUTHORIZATION', $_SERVER)) && //Apache mod_rewrite with FCGI (empty($_SERVER['SERVER_SOFTWARE']) || (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') === false)) && //nginx should be fine (empty($_SERVER['SERVER_SOFTWARE']) || (stripos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') === false)) && //lighttpd should be fine ((!function_exists('getallheaders')) || (stripos(php_sapi_name(), 'cgi') !== false))) { //Main problem is Apache/CGI mode |
