X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=6c2782c0fab892fda18a8bf9eedc45dc122c3288;hb=231192f7e0b32793711695ed047842f11260fc92;hp=6c2efc296aa52c2c3f06f14e6c106cb6213addb7;hpb=4f21e6be661f7305abc223bb31600970a3fb5326;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 6c2efc296a..6c2782c0fa 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -175,14 +175,14 @@ class AjaxResponse {
 		}
 
 		if ( $this->mCacheDuration ) {
-			# If squid caches are configured, tell them to cache the response,
-			# and tell the client to always check with the squid. Otherwise,
+			# If CDN caches are configured, tell them to cache the response,
+			# and tell the client to always check with the CDN. Otherwise,
 			# tell the client to use a cached copy, without a way to purge it.
 
 			if ( $this->mConfig->get( 'UseSquid' ) ) {
 				# Expect explicit purge of the proxy cache, but require end user agents
 				# to revalidate against the proxy on each visit.
-				# Surrogate-Control controls our Squid, Cache-Control downstream caches
+				# Surrogate-Control controls our CDN, Cache-Control downstream caches
 
 				if ( $this->mConfig->get( 'UseESI' ) ) {
 					header( 'Surrogate-Control: max-age=' . $this->mCacheDuration . ', content="ESI/1.0"' );
@@ -223,12 +223,12 @@ class AjaxResponse {
 		$fname = 'AjaxResponse::checkLastModified';
 
 		if ( !$timestamp || $timestamp == '19700101000000' ) {
-			wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n", 'log' );
+			wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP", 'private' );
 			return false;
 		}
 
 		if ( !$wgCachePages ) {
-			wfDebug( "$fname: CACHE DISABLED\n", 'log' );
+			wfDebug( "$fname: CACHE DISABLED", 'private' );
 			return false;
 		}
 
@@ -242,8 +242,8 @@ class AjaxResponse {
 			$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
 			$modsinceTime = strtotime( $modsince );
 			$ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
-			wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", 'log' );
-			wfDebug( "$fname: --  we might send Last-Modified : $lastmod\n", 'log' );
+			wfDebug( "$fname: -- client send If-Modified-Since: $modsince", 'private' );
+			wfDebug( "$fname: --  we might send Last-Modified : $lastmod", 'private' );
 
 			if ( ( $ismodsince >= $timestamp )
 				&& $wgUser->validateCache( $ismodsince ) &&
@@ -255,16 +255,16 @@ class AjaxResponse {
 				$this->mLastModified = $lastmod;
 
 				wfDebug( "$fname: CACHED client: $ismodsince ; user: {$wgUser->getTouched()} ; " .
-					"page: $timestamp ; site $wgCacheEpoch\n", 'log' );
+					"page: $timestamp ; site $wgCacheEpoch", 'private' );
 
 				return true;
 			} else {
 				wfDebug( "$fname: READY  client: $ismodsince ; user: {$wgUser->getTouched()} ; " .
-					"page: $timestamp ; site $wgCacheEpoch\n", 'log' );
+					"page: $timestamp ; site $wgCacheEpoch", 'private' );
 				$this->mLastModified = $lastmod;
 			}
 		} else {
-			wfDebug( "$fname: client did not send If-Modified-Since header\n", 'log' );
+			wfDebug( "$fname: client did not send If-Modified-Since header", 'private' );
 			$this->mLastModified = $lastmod;
 		}
 		return false;
@@ -276,22 +276,20 @@ class AjaxResponse {
 	 * @return bool
 	 */
 	function loadFromMemcached( $mckey, $touched ) {
-		global $wgMemc;
-
 		if ( !$touched ) {
 			return false;
 		}
 
-		$mcvalue = $wgMemc->get( $mckey );
+		$mcvalue = ObjectCache::getMainWANInstance()->get( $mckey );
 		if ( $mcvalue ) {
 			# Check to see if the value has been invalidated
 			if ( $touched <= $mcvalue['timestamp'] ) {
-				wfDebug( "Got $mckey from cache\n" );
+				wfDebug( "Got $mckey from cache" );
 				$this->mText = $mcvalue['value'];
 
 				return true;
 			} else {
-				wfDebug( "$mckey has expired\n" );
+				wfDebug( "$mckey has expired" );
 			}
 		}
 
@@ -304,9 +302,7 @@ class AjaxResponse {
 	 * @return bool
 	 */
 	function storeInMemcached( $mckey, $expiry = 86400 ) {
-		global $wgMemc;
-
-		$wgMemc->set( $mckey,
+		ObjectCache::getMainWANInstance()->set( $mckey,
 			array(
 				'timestamp' => wfTimestampNow(),
 				'value' => $this->mText