aboutsummaryrefslogtreecommitdiffstats
path: root/includes/filerepo/backend/lockmanager
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2012-07-18 13:43:36 -0700
committerAaron Schulz <aschulz@wikimedia.org>2012-07-18 13:43:51 -0700
commitfa0e2e615dcddb50bc8ef067227c7b71091916f8 (patch)
tree6c77f334245541c9c788a02da91a62b983954ce5 /includes/filerepo/backend/lockmanager
parente6faa2fd76040d1cbadc6e439ecf51f8f4e52bd4 (diff)
downloadmediawikicore-fa0e2e615dcddb50bc8ef067227c7b71091916f8.tar.gz
mediawikicore-fa0e2e615dcddb50bc8ef067227c7b71091916f8.zip
[LockManager] Made LSLockManager session 32 chars (128 bits).
Change-Id: I1eba3eb44ebef02c771b518c2bcbdc0d41eb8086
Diffstat (limited to 'includes/filerepo/backend/lockmanager')
-rw-r--r--includes/filerepo/backend/lockmanager/LSLockManager.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/includes/filerepo/backend/lockmanager/LSLockManager.php b/includes/filerepo/backend/lockmanager/LSLockManager.php
index 024e11b717e7..894281828cfb 100644
--- a/includes/filerepo/backend/lockmanager/LSLockManager.php
+++ b/includes/filerepo/backend/lockmanager/LSLockManager.php
@@ -57,14 +57,14 @@ class LSLockManager extends QuorumLockManager {
* Construct a new instance from configuration.
*
* $config paramaters include:
- * 'lockServers' : Associative array of server names to configuration.
- * Configuration is an associative array that includes:
- * 'host' - IP address/hostname
- * 'port' - TCP port
- * 'authKey' - Secret string the lock server uses
- * 'srvsByBucket' : Array of 1-16 consecutive integer keys, starting from 0,
- * each having an odd-numbered list of server names (peers) as values.
- * 'connTimeout' : Lock server connection attempt timeout. [optional]
+ * - lockServers : Associative array of server names to configuration.
+ * Configuration is an associative array that includes:
+ * - host : IP address/hostname
+ * - port : TCP port
+ * - authKey : Secret string the lock server uses
+ * - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
+ * each having an odd-numbered list of server names (peers) as values.
+ * - connTimeout : Lock server connection attempt timeout. [optional]
*
* @param Array $config
*/
@@ -82,7 +82,7 @@ class LSLockManager extends QuorumLockManager {
$this->connTimeout = 3; // use some sane amount
}
- $this->session = wfRandomString( 31 );
+ $this->session = wfRandomString( 32 ); // 128 bits
}
/**