X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FWebStart.php;h=17f8216babf0a77240cb265b777a70150156a4ee;hb=2c83ec33e432defdeb0fc06bf71c649f789b233b;hp=2154eba07c895ca34495507a8e52395c9ab11cce;hpb=a2d0800d6bce9a9f69df0e63af39ba0e4b80005a;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 2154eba07c..17f8216bab 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -1,24 +1,33 @@
-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";
- die( -1 );
-}
+/**
+ * This does the initial setup for a web request.
+ * It does some security checks, starts the profiler and loads the
+ * configuration, and optionally loads Setup.php depending on whether
+ * MW_NO_SETUP is defined.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
# Protect against register_globals
# This must be done before any globals are set by the code
if ( ini_get( 'register_globals' ) ) {
- if ( isset( $_REQUEST['GLOBALS'] ) ) {
- die( '$GLOBALS overwrite vulnerability');
+ if ( isset( $_REQUEST['GLOBALS'] ) || isset( $_FILES['GLOBALS'] ) ) {
+ die( '$GLOBALS overwrite vulnerability');
}
$verboten = array(
'GLOBALS',
@@ -40,7 +49,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 );
}
@@ -48,6 +57,11 @@ if ( ini_get( 'register_globals' ) ) {
}
}
+# bug 15461: Make IE8 turn off content sniffing. Everbody else should ignore this
+# We're adding it here so that it's *always* set, even for alternate entry
+# points and when $wgOut gets disabled or overridden.
+header( 'X-Content-Type-Options: nosniff' );
+
$wgRequestTime = microtime(true);
# getrusage() does not exist on the Microsoft Windows platforms, catching this
if ( function_exists ( 'getrusage' ) ) {
@@ -56,7 +70,6 @@ if ( function_exists ( 'getrusage' ) ) {
$wgRUstart = array();
}
unset( $IP );
-@ini_set( 'allow_url_fopen', 0 ); # For security
# Valid web server entry point, enable includes.
# Please don't move this line to includes/Defines.php. This line essentially
@@ -69,42 +82,78 @@ define( 'MEDIAWIKI', true );
# Makes it possible to for example to have effective exclude path in apc.
# Also doesn't break installations using symlinked includes, like
# dirname( __FILE__ ) would do.
-$preIP = realpath( '.' );
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = realpath( '.' );
+}
+
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+ define( 'MW_COMPILED', 1 );
+} else {
+ # Get MWInit class
+ require_once( "$IP/includes/Init.php" );
+
+ # Start the autoloader, so that extensions can derive classes from core files
+ require_once( "$IP/includes/AutoLoader.php" );
+
+ # Load the profiler
+ require_once( "$IP/includes/profiler/Profiler.php" );
+
+ # Load up some global defines.
+ require_once( "$IP/includes/Defines.php" );
+}
+
+# Start the profiler
+$wgProfiler = array();
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+ require( "$IP/StartProfiler.php" );
+}
-# Start profiler
-require_once( "$preIP/StartProfiler.php" );
wfProfileIn( 'WebStart.php-conf' );
-# Load up some global defines.
-require_once( "$preIP/includes/Defines.php" );
-
-# 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( "$preIP/LocalSettings.php" ) ) {
- # DefaultSettings assumes $IP is defined, like it usually is when included
- # in LocalSettings. But in this case we need to provide the default one.
- $IP = $preIP;
- require_once( "$preIP/includes/DefaultSettings.php" ); # used for printing the version
- require_once( "$preIP/includes/templates/NoLocalSettings.php" );
- die();
+# Load default settings
+require_once( MWInit::compiledPath( "includes/DefaultSettings.php" ) );
+
+if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
+ # Use a callback function to configure MediaWiki
+ MWFunction::call( MW_CONFIG_CALLBACK );
+} else {
+ if ( !defined( 'MW_CONFIG_FILE' ) ) {
+ define('MW_CONFIG_FILE', MWInit::interpretedPath( '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( MW_CONFIG_FILE );
+}
+
+if ( $wgEnableSelenium ) {
+ require_once( MWInit::compiledPath( "includes/SeleniumWebSettings.php" ) );
}
-# Include site settings. Most importantly, $IP should be available after this.
-require_once( "$preIP/LocalSettings.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' ) ) {
- require_once( "$IP/includes/OutputHandler.php" );
+# 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 ) {
+ if ( !defined( 'MW_COMPILED' ) ) {
+ require_once( "$IP/includes/OutputHandler.php" );
+ }
ob_start( 'wfOutputHandler' );
}
wfProfileOut( 'WebStart.php-ob_start' );
if ( !defined( 'MW_NO_SETUP' ) ) {
- require_once( "$IP/includes/Setup.php" );
+ require_once( MWInit::compiledPath( "includes/Setup.php" ) );
}
+