http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93563
Revision: 93563 Author: brion Date: 2011-07-31 01:52:38 +0000 (Sun, 31 Jul 2011) Log Message: ----------- * (bug 30131) XCache with variable caching disabled no longer used for variable caching (CACHE_ACCEL) Patch from John Du Hart: https://bugzilla.wikimedia.org/attachment.cgi?id=8849&action=diff If XCache is present, but the xcache.var_size setting is off, we'll now consider it as xcache being disabled for CACHE_ACCEL purposes. It won't trigger view of the accelerator option in the installer, and at runtime if using CACHE_ACCEL and no other modules are available, it'll throw an error so you know that it doesn't work! Modified Paths: -------------- trunk/phase3/RELEASE-NOTES-1.18 trunk/phase3/includes/installer/Installer.php trunk/phase3/includes/objectcache/ObjectCache.php Modified: trunk/phase3/RELEASE-NOTES-1.18 =================================================================== --- trunk/phase3/RELEASE-NOTES-1.18 2011-07-31 01:32:19 UTC (rev 93562) +++ trunk/phase3/RELEASE-NOTES-1.18 2011-07-31 01:52:38 UTC (rev 93563) @@ -432,6 +432,7 @@ * (bug 27427) mw.util.getParamValue shouldn't return value from hash even if param is only present in hash. * Installer checked for magic_quotes_runtime instead of register_globals. +* (bug 30131) XCache with variable caching disabled no longer used for variable caching (CACHE_ACCEL) === API changes in 1.18 === * BREAKING CHANGE: action=watch now requires POST and token. Modified: trunk/phase3/includes/installer/Installer.php =================================================================== --- trunk/phase3/includes/installer/Installer.php 2011-07-31 01:32:19 UTC (rev 93562) +++ trunk/phase3/includes/installer/Installer.php 2011-07-31 01:52:38 UTC (rev 93563) @@ -791,6 +791,9 @@ $caches = array(); foreach ( $this->objectCaches as $name => $function ) { if ( function_exists( $function ) ) { + if ( $name == 'xcache' && !wfIniGetBool( 'xcache.var_size' ) ) { + continue; + } $caches[$name] = true; } } Modified: trunk/phase3/includes/objectcache/ObjectCache.php =================================================================== --- trunk/phase3/includes/objectcache/ObjectCache.php 2011-07-31 01:32:19 UTC (rev 93562) +++ trunk/phase3/includes/objectcache/ObjectCache.php 2011-07-31 01:52:38 UTC (rev 93563) @@ -93,7 +93,7 @@ $id = 'eaccelerator'; } elseif ( function_exists( 'apc_fetch') ) { $id = 'apc'; - } elseif( function_exists( 'xcache_get' ) ) { + } elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) { $id = 'xcache'; } elseif( function_exists( 'wincache_ucache_get' ) ) { $id = 'wincache'; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
