X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=index.php;h=30add938e09456752104fc62c60480b195e66649;hb=022b7ba1406a4f402ff24c355288cb6ffd6eb82d;hp=88585792f820360dc1f3f52a8a6f069fcb14c0e3;hpb=b3d0a9767ec056a959a7e7404cc83d551e75f185;p=lhc%2Fweb%2Fwiklou.git

diff --git a/index.php b/index.php
index 88585792f8..30add938e0 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
  *
  * ----------
  *
- * Copyright (C) 2001-2008 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+ * Copyright (C) 2001-2010 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
  * Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason,
  * Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor,
  * Aaron Schulz and others.
@@ -32,9 +32,10 @@
  * 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
  */
 
-
 # Initialise common code
 $preIP = dirname( __FILE__ );
 require_once( "$preIP/includes/WebStart.php" );
@@ -47,7 +48,7 @@ wfProfileIn( 'main-misc-setup' );
 OutputPage::setEncodings(); # Not really used yet
 
 $maxLag = $wgRequest->getVal( 'maxlag' );
-if( !is_null($maxLag) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
+if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
 	exit;
 }
 
@@ -55,8 +56,9 @@ if( !is_null($maxLag) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
+# Set title from request parameters
 $wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
-if( $wgTitle === NULL ) {
+if( $wgTitle === null ) {
 	unset( $wgTitle );
 }
 
@@ -67,13 +69,36 @@ wfProfileOut( 'main-misc-setup' );
 #
 if( $wgUseAjax && $action == 'ajax' ) {
 	require_once( $IP . '/includes/AjaxDispatcher.php' );
-
 	$dispatcher = new AjaxDispatcher();
 	$dispatcher->performAction();
 	$mediaWiki->restInPeace();
 	exit;
 }
 
+if( $wgUseFileCache && isset( $wgTitle ) ) {
+	wfProfileIn( 'main-try-filecache' );
+	// Raw pages should handle cache control on their own,
+	// even when using file cache. This reduces hits from clients.
+	if( $action != 'raw' && HTMLFileCache::useFileCache() ) {
+		/* Try low-level file cache hit */
+		$cache = new HTMLFileCache( $wgTitle, $action );
+		if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
+			/* Check incoming headers to see if client has this cached */
+			if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
+				$cache->loadFromFileCache();
+			}
+			# Do any stats increment/watchlist stuff
+			$wgArticle = MediaWiki::articleFromTitle( $wgTitle );
+			$wgArticle->viewUpdates();
+			# Tell $wgOut that output is taken care of
+			wfProfileOut( 'main-try-filecache' );
+			$mediaWiki->restInPeace();
+			exit;
+		}
+	}
+	wfProfileOut( 'main-try-filecache' );
+}
+
 # Setting global variables in mediaWiki
 $mediaWiki->setVal( 'action', $action );
 $mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
@@ -88,8 +113,8 @@ $mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
 $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
-$mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgOut );
+$mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );