Follow up r65286. If we are going to support <img we should support width and height

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 4887038..b37fb5e 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -180,24 +180,33 @@ $wgRequest = new WebRequest;
 # Useful debug output
 if ( $wgCommandLineMode ) {
        wfDebug( "\n\nStart command line script $self\n" );
-} elseif ( function_exists( 'getallheaders' ) ) {
-       wfDebug( "\n\nStart request\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
-       $headers = getallheaders();
-       foreach ($headers as $name => $value) {
-               wfDebug( "$name: $value\n" );
-       }
-       wfDebug( "\n" );
-} elseif( isset( $_SERVER['REQUEST_URI'] ) ) {
-       wfDebug( "\n\nStart request\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
-       foreach ( $_SERVER as $name => $value ) {
-               if ( substr( $name, 0, 5 ) == 'HTTP_' ) {
-                       $name = substr( $name, 5 );
-                       wfDebug( "$name: $value\n" );
+} else {
+       wfDebug( "Start request\n\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";
+
+               if ( function_exists( 'getallheaders' ) ) {
+                       $headers = getallheaders();
+                       foreach ( $headers as $name => $value ) {
+                               $headerOut .= "$name: $value\n";
+                       }
+               } else {
+                       $headers = $_SERVER;
+                       foreach ( $headers as $name => $value ) {
+                               if ( substr( $name, 0, 5 ) !== 'HTTP_' ) continue;
+                               $name = substr( $name, 5 );
+                               $headerOut .= "$name: $value\n";
+                       }
                }
+               wfDebug( "$headerOut\n" );
        }
-       wfDebug( "\n" );
 }
 
 if( $wgRCFilterByAge ) {
@@ -255,9 +264,9 @@ $wgMemc =& wfGetMainCache();
 $messageMemc =& wfGetMessageCacheStorage();
 $parserMemc =& wfGetParserCacheStorage();
 
-wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
-       "\nMessage cache: " . get_class( $messageMemc ) .
-       "\nParser cache: " . get_class( $parserMemc ) . "\n" );
+wfDebug( 'CACHES: ' . get_class( $wgMemc ) . '[main] ' .
+       get_class( $messageMemc ) . '[message] ' .
+       get_class( $parserMemc ) . "[parser]\n" );
 
 wfProfileOut( $fname.'-memcached' );
 
@@ -337,8 +346,6 @@ $wgPostCommitUpdateList = array();
 
 if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';
-if( $wgAjaxLicensePreview )
-       $wgAjaxExportList[] = 'SpecialUpload::ajaxGetLicensePreview';
 
 # Placeholders in case of DB error
 $wgTitle = null;