http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93564
Revision: 93564
Author: brion
Date: 2011-07-31 02:02:51 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
MFT r93563: (bug 30131) XCache with variable caching disabled no longer used
for variable caching (CACHE_ACCEL)
Modified Paths:
--------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/installer/Installer.php
branches/REL1_18/phase3/includes/objectcache/ObjectCache.php
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-07-31 01:52:38 UTC (rev
93563)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-07-31 02:02:51 UTC (rev
93564)
@@ -421,6 +421,7 @@
* (bug 29959) Installer fatal when cURL and allow_url_fopen is disabled and
user
tries to subsribe to mediawiki-announce
* 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: branches/REL1_18/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/Installer.php 2011-07-31
01:52:38 UTC (rev 93563)
+++ branches/REL1_18/phase3/includes/installer/Installer.php 2011-07-31
02:02:51 UTC (rev 93564)
@@ -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: branches/REL1_18/phase3/includes/objectcache/ObjectCache.php
===================================================================
--- branches/REL1_18/phase3/includes/objectcache/ObjectCache.php
2011-07-31 01:52:38 UTC (rev 93563)
+++ branches/REL1_18/phase3/includes/objectcache/ObjectCache.php
2011-07-31 02:02:51 UTC (rev 93564)
@@ -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
