Merge "Remove extra unneeded whitespace"

[lhc/web/wiklou.git] / includes / objectcache / ObjectCache.php

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 25d4d47..2e00e16 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -1,10 +1,31 @@
 <?php
 /**
- * Functions to get cache objects
+ * Functions to get cache objects.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * 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
  * @ingroup Cache
  */
+
+/**
+ * Functions to get cache objects
+ *
+ * @ingroup Cache
+ */
 class ObjectCache {
        static $instances = array();
 
@@ -43,7 +64,7 @@ class ObjectCache {
                global $wgObjectCaches;
 
                if ( !isset( $wgObjectCaches[$id] ) ) {
-                       throw new MWException( "Invalid object cache type \"$id\" requested. " . 
+                       throw new MWException( "Invalid object cache type \"$id\" requested. " .
                                "It is not present in \$wgObjectCaches." );
                }
 
@@ -71,6 +92,13 @@ class ObjectCache {
 
        /**
         * Factory function referenced from DefaultSettings.php for CACHE_ANYTHING
+        *
+        * CACHE_ANYTHING means that stuff has to be cached, not caching is not an option.
+        * If a caching method is configured for any of the main caches ($wgMainCacheType,
+        * $wgMessageCacheType, $wgParserCacheType), then CACHE_ANYTHING will effectively
+        * be an alias to the configured cache choice for that.
+        * If no cache choice is configured (by default $wgMainCacheType is CACHE_NONE),
+        * then CACHE_ANYTHING will forward to CACHE_DB.
         */
        static function newAnything( $params ) {
                global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
@@ -89,11 +117,9 @@ class ObjectCache {
         * @return ObjectCache
         */
        static function newAccelerator( $params ) {
-               if ( function_exists( 'eaccelerator_get' ) ) {
-                       $id = 'eaccelerator';
-               } elseif ( function_exists( 'apc_fetch') ) {
+               if ( 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';
@@ -106,11 +132,13 @@ class ObjectCache {
 
        /**
         * Factory function that creates a memcached client object.
-        * The idea of this is that it might eventually detect and automatically 
-        * support the PECL extension, assuming someone can get it to compile.
+        *
+        * This always uses the PHP client, since the PECL client has a different 
+        * hashing scheme and a different interpretation of the flags bitfield, so 
+        * switching between the two clients randomly would be disasterous.
         *
         * @param $params array
-        * 
+        *
         * @return MemcachedPhpBagOStuff
         */
        static function newMemcached( $params ) {