Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/228173
Change subject: rl-test: Fix IP detection to use WebRequest::getIP ...................................................................... rl-test: Fix IP detection to use WebRequest::getIP Because REMOTE_ADDR is not useful in prod due to internal proxies. Bug: T105255 Change-Id: If759306ffc08cc9b48ee6e994116d1fc1be9a053 --- M w/rl-test.php 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/73/228173/1 diff --git a/w/rl-test.php b/w/rl-test.php index a72658a..eeaf5d7 100644 --- a/w/rl-test.php +++ b/w/rl-test.php @@ -1,6 +1,10 @@ <?php +require '/srv/mediawiki/w/MWVersion.php'; +require getMediaWiki( 'includes/WebStart.php' ); +#require_once __DIR__ . '/includes/WebStart.php'; -date_default_timezone_set( 'UTC' ); +global $wgRequest; + header( 'Access-Control-Allow-Origin: *' ); header( 'Content-Type: text/plain; charset=utf-8' ); @@ -15,10 +19,9 @@ } $ua = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '-'; +$ip = $wgRequest->getIP(); -$ip = isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : '-'; - -$line = "[$date] vers\nion: $version; ip: $ip; ua: $ua"; +$line = "[$date] version: $version; ip: $ip; ua: $ua"; // Clean up $line = strtr( $line, array( -- To view, visit https://gerrit.wikimedia.org/r/228173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If759306ffc08cc9b48ee6e994116d1fc1be9a053 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
