nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-24 17:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'server-array-upper' into 'master'

Browse Source 
Convert array keys for $_SERVER to uppercase

See merge request !38
This commit is contained in:
Florian Schlichting 2017-04-24 21:59:08 +00:00
commit bbea62d288
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/always.php
View File

@ -184,20 +184,20 @@ ob_end_clean();
* Override server-detected variables with those from X-Forwarded headers
*/
if ( isset($c->trust_x_forwarded) && $c->trust_x_forwarded ) {
if ( isset($_SERVER['X-Real-IP']) ) {
$_SERVER['REMOTE_ADDR'] = $_SERVER['X-Real-IP'];
} elseif ( isset($_SERVER['X-Forwarded-For']) ) {
list($_SERVER['REMOTE_ADDR'], $rest) = explode( ',', $_SERVER['X-Forwarded-For']);
if ( isset($_SERVER['HTTP_X_REAL_IP']) ) {
$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_REAL_IP'];
} elseif ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) {
list($_SERVER['REMOTE_ADDR'], $rest) = explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR']);
}
if ( isset($_SERVER['X-Forwarded-Proto']) ) {
if ($_SERVER['X-Forwarded-Proto'] == 'https') {
if ( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) ) {
if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
$_SERVER['HTTPS'] = 'on';
} else {
$_SERVER['HTTPS'] = 'off';
}
}
if ( isset($_SERVER['X-Forwarded-Port']) ) {
$_SERVER['SERVER_PORT'] = $_SERVER['X-Forwarded-Port'];
if ( isset($_SERVER['HTTP_X_FORWARDED_PORT']) ) {
$_SERVER['SERVER_PORT'] = $_SERVER['HTTP_X_FORWARDED_PORT'];
}
}

16
inc/always.php.in
View File

@ -184,20 +184,20 @@ ob_end_clean();
* Override server-detected variables with those from X-Forwarded headers
*/
if ( isset($c->trust_x_forwarded) && $c->trust_x_forwarded ) {
if ( isset($_SERVER['X-Real-IP']) ) {
$_SERVER['REMOTE_ADDR'] = $_SERVER['X-Real-IP'];
} elseif ( isset($_SERVER['X-Forwarded-For']) ) {
list($_SERVER['REMOTE_ADDR'], $rest) = explode( ',', $_SERVER['X-Forwarded-For']);
if ( isset($_SERVER['HTTP_X_REAL_IP']) ) {
$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_REAL_IP'];
} elseif ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) {
list($_SERVER['REMOTE_ADDR'], $rest) = explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR']);
}
if ( isset($_SERVER['X-Forwarded-Proto']) ) {
if ($_SERVER['X-Forwarded-Proto'] == 'https') {
if ( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) ) {
if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
$_SERVER['HTTPS'] = 'on';
} else {
$_SERVER['HTTPS'] = 'off';
}
}
if ( isset($_SERVER['X-Forwarded-Port']) ) {
$_SERVER['SERVER_PORT'] = $_SERVER['X-Forwarded-Port'];
if ( isset($_SERVER['HTTP_X_FORWARDED_PORT']) ) {
$_SERVER['SERVER_PORT'] = $_SERVER['HTTP_X_FORWARDED_PORT'];
}
}