$_SERVER['REQUEST_URI'] is not available using IIS with rewrite rules, so use HTTP_X_...

diff --git a/includes/Setup.php b/includes/Setup.php
index cd9146a..b37fb5e 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -182,7 +182,12 @@ if ( $wgCommandLineMode ) {
        wfDebug( "\n\nStart command line script $self\n" );
 } else {
        wfDebug( "Start request\n\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+       # Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
+       # so use an alternative
+       $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : 
+               ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] :
+               $_SERVER['PHP_SELF'] );
+       wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
 
        if ( $wgDebugPrintHttpHeaders ) {
                $headerOut = "HTTP HEADERS:\n";