(bug 18173) Login form exception on malformed REMOTE_ADDR, wfGetIP() now falls back...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 232b091..d693842 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -182,6 +182,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Multiple whitespace in TOC anchors is now stripped, for consistency with the
   link from the edit comment
 * (bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine
+* (bug 18173) Login form exception on malformed REMOTE_ADDR, wfGetIP() now falls 
+  back to 127.0.01 if the IP cannot be determined
 
 == API changes in 1.16 ==
 

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 771fd57..7331d74 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -76,10 +76,10 @@ function wfGetIP() {
 
        /* collect the originating ips */
        # Client connecting to this webserver
-       if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
+       if ( isset( $_SERVER['REMOTE_ADDR'] ) && IP::canonicalize( $_SERVER['REMOTE_ADDR'] ) ) {
                $ipchain = array( IP::canonicalize( $_SERVER['REMOTE_ADDR'] ) );
        } else {
-               # Running on CLI?
+               # Running on CLI or REMOTE_ADDR is broken
                $ipchain = array( '127.0.0.1' );
        }
        $ip = $ipchain[0];