Fixes Bug #28214 - When page not found, sends malformed HTTP/1.x instead of HTTP...

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

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 664029e..2c21cdb 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -34,7 +34,7 @@ if ( ini_get( 'register_globals' ) ) {
        );
        foreach ( $_REQUEST as $name => $value ) {
                if( in_array( $name, $verboten ) ) {
-                       header( "HTTP/1.x 500 Internal Server Error" );
+                       header( "HTTP/1.1 500 Internal Server Error" );
                        echo "register_globals security paranoia: trying to overwrite superglobals, aborting.";
                        die( -1 );
                }
@@ -89,49 +89,43 @@ if ( !function_exists( 'version_compare' )
        exit;
 }
 
-# Test for PHP bug which breaks PHP 5.0.x on 64-bit...
-# As of 1.8 this breaks lots of common operations instead
-# of just some rare ones like export.
-$borked = str_replace( 'a', 'b', array( -1 => -1 ) );
-if( !isset( $borked[-1] ) ) {
-       echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" .
-            "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n";
-       exit;
-}
-
 # Start the autoloader, so that extensions can derive classes from core files
 require_once( "$IP/includes/AutoLoader.php" );
+# Load default settings
+require_once( "$IP/includes/DefaultSettings.php" );
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
-       require_once( "$IP/includes/DefaultSettings.php" );
-
-       $callback = MW_CONFIG_CALLBACK;
-       if ( strpos( $callback, '::' ) !== false ) {
-               $callback = explode( '::', $callback, 2);
-       }
-       call_user_func( $callback );
+       MWFunction::call( MW_CONFIG_CALLBACK );
+       
 } else {
-       # LocalSettings.php is the per site customization file. If it does not exit
-       # the wiki installer need to be launched or the generated file moved from
-       # ./config/ to ./
-       if( !file_exists( "$IP/LocalSettings.php" ) ) {
-               require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
+       if ( !defined('MW_CONFIG_FILE') )
+               define('MW_CONFIG_FILE', "$IP/LocalSettings.php");
+       
+       # LocalSettings.php is the per site customization file. If it does not exist
+       # the wiki installer needs to be launched or the generated file uploaded to
+       # the root wiki directory
+       if( !file_exists( MW_CONFIG_FILE ) ) {
                require_once( "$IP/includes/templates/NoLocalSettings.php" );
                die();
        }
 
        # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
-       require_once( "$IP/LocalSettings.php" );
+       require_once( MW_CONFIG_FILE );
 }
+
+if ( $wgEnableSelenium ) {
+       require_once( "$IP/includes/SeleniumWebSettings.php" );
+}
+
 wfProfileOut( 'WebStart.php-conf' );
 
 wfProfileIn( 'WebStart.php-ob_start' );
 # Initialise output buffering
-if ( ob_get_level() ) {
-       # Someone's been mixing configuration data with code!
-       # How annoying.
-} elseif ( !defined( 'MW_NO_OUTPUT_BUFFER' ) ) {
+# Check that there is no previous output or previously set up buffers, because
+# that would cause us to potentially mix gzip and non-gzip output, creating a
+# big mess.
+if ( !defined( 'MW_NO_OUTPUT_BUFFER' ) && ob_get_level() == 0 ) {
        require_once( "$IP/includes/OutputHandler.php" );
        ob_start( 'wfOutputHandler' );
 }
@@ -140,3 +134,4 @@ wfProfileOut( 'WebStart.php-ob_start' );
 if ( !defined( 'MW_NO_SETUP' ) ) {
        require_once( "$IP/includes/Setup.php" );
 }
+