Add $wgAuthenticationTokenVersion

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4385f0e..2b3e6e2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2146,7 +2146,7 @@ $wgMessageCacheType = CACHE_ANYTHING;
 $wgParserCacheType = CACHE_ANYTHING;
 
 /**
- * The cache type for storing session data.
+ * The cache type for storing session data. Used if $wgSessionsInObjectCache is true.
  *
  * For available types see $wgMainCacheType.
  */
@@ -2281,29 +2281,30 @@ $wgParserCacheExpireTime = 86400;
  *
  * @deprecated since 1.20; Use $wgSessionsInObjectCache
  */
-$wgSessionsInMemcached = true;
+$wgSessionsInMemcached = false;
 
 /**
- * @deprecated since 1.27, session data is always stored in object cache.
+ * Store sessions in an object cache, configured by $wgSessionCacheType. This
+ * can be useful to improve performance, or to avoid the locking behavior of
+ * PHP's default session handler, which tends to prevent multiple requests for
+ * the same user from acting concurrently.
  */
-$wgSessionsInObjectCache = true;
+$wgSessionsInObjectCache = false;
 
 /**
- * The expiry time to use for session storage, in seconds.
+ * The expiry time to use for session storage when $wgSessionsInObjectCache is
+ * enabled, in seconds.
  */
 $wgObjectCacheSessionExpiry = 3600;
 
 /**
- * @deprecated since 1.27, MediaWiki\\Session\\SessionManager doesn't use PHP session storage.
+ * This is used for setting php's session.save_handler. In practice, you will
+ * almost never need to change this ever. Other options might be 'user' or
+ * 'session_mysql.' Setting to null skips setting this entirely (which might be
+ * useful if you're doing cross-application sessions, see bug 11381)
  */
 $wgSessionHandler = null;
 
-/**
- * Whether to use PHP session handling ($_SESSION and session_*() functions)
- * @var string 'enable', 'warn', or 'disable'
- */
-$wgPHPSessionHandling = 'enable';
-
 /**
  * If enabled, will send MemCached debugging information to $wgDebugLogFile
  */
@@ -4633,28 +4634,16 @@ $wgUserrightsInterwikiDelimiter = '@';
 $wgSecureLogin = false;
 
 /**
- * MediaWiki\Session\SessionProvider configuration.
+ * Versioning for authentication tokens.
  *
- * Value is an array of ObjectFactory specifications for the SessionProviders
- * to be used. Keys in the array are ignored. Order is not significant.
+ * If non-null, this is combined with the user's secret (the user_token field
+ * in the DB) to generate the token cookie. Changing this will invalidate all
+ * active sessions (i.e. it will log everyone out).
  *
  * @since 1.27
+ * @var string|null
  */
-$wgSessionProviders = array(
-       'MediaWiki\\Session\\CookieSessionProvider' => array(
-               'class' => 'MediaWiki\\Session\\CookieSessionProvider',
-               'args' => array( array(
-                       'priority' => 30,
-                       'callUserSetCookiesHook' => true,
-               ) ),
-       ),
-       'MediaWiki\\Session\\BotPasswordSessionProvider' => array(
-               'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider',
-               'args' => array( array(
-                       'priority' => 40,
-               ) ),
-       ),
-);
+$wgAuthenticationTokenVersion = null;
 
 /** @} */ # end user accounts }
 
@@ -5492,29 +5481,6 @@ $wgGrantPermissionGroups = array(
        'highvolume'          => 'high-volume',
 );
 
-/**
- * @var bool Whether to enable bot passwords
- * @since 1.27
- */
-$wgEnableBotPasswords = true;
-
-/**
- * Cluster for the bot_passwords table
- * @var string|bool If false, the normal cluster will be used
- * @since 1.27
- */
-$wgBotPasswordsCluster = false;
-
-/**
- * Database name for the bot_passwords table
- *
- * To use a database with a table prefix, set this variable to
- * "{$database}-{$prefix}".
- * @var string|bool If false, the normal database will be used
- * @since 1.27
- */
-$wgBotPasswordsDatabase = false;
-
 /** @} */ # end of user rights settings
 
 /************************************************************************//**
@@ -6648,6 +6614,14 @@ $wgExportFromNamespaces = false;
  */
 $wgExportAllowAll = false;
 
+/**
+ * Maximum number of pages returned by the GetPagesFromCategory and
+ * GetPagesFromNamespace functions.
+ *
+ * @since 1.27
+ */
+$wgExportPagelistLimit = 5000;
+
 /** @} */ # end of import/export }
 
 /*************************************************************************//**