Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F8327
xcacheFix.patch
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Authored By
•
bzimport
Nov 21 2014, 11:57 PM
2014-11-21 23:57:33 (UTC+0)
Size
1 KB
Referenced Files
None
Subscribers
None
xcacheFix.patch
View Options
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 8cdde63..c53a3aa 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -791,6 +791,9 @@ abstract class Installer {
$caches = array();
foreach ( $this->objectCaches as $name => $function ) {
if ( function_exists( $function ) ) {
+ if ( $name == 'xcache' && !wfIniGetBool( 'xcache.var_size' ) ) {
+ continue;
+ }
$caches[$name] = true;
}
}
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 25d4d47..99e3895 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -93,7 +93,7 @@ class ObjectCache {
$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';
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
7851
Default Alt Text
xcacheFix.patch (1 KB)
Attached To
Mode
T32131: XCache used as ObjectCache even if variable storage is disabled
Attached
Detach File
Event Timeline
Log In to Comment