From 50f2612218fa7df442cf93f688c2c5a0162199a5 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Thu, 31 Mar 2005 10:37:54 +0000 Subject: [PATCH] fixed bug --- includes/ProxyTools.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php index d335faee93..cf19119571 100644 --- a/includes/ProxyTools.php +++ b/includes/ProxyTools.php @@ -32,8 +32,12 @@ function wfGetIP() if ( count( $trustedProxies ) ) { # Append XFF on to $ipchain if ( isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) { - $ipchain = array_merge( $ipchain, array_map( 'trim', explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) ); + $xff = explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] ); + for ( $i = 1; $i <= count( $xff ); $i++ ) { + $ipchain[$i] = trim( $xff[count($xff) - $i ); + } } + var_dump( $ipchain ); # Step through XFF list and find the last address in the list which is a trusted server # Set $ip to the IP address given by that trusted server, unless the address is not sensible (e.g. private) foreach ( $ipchain as $i => $curIP ) { -- 2.20.1