dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ResourceLoaderStartUpModule: Use hashMtime to detect config changes"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
BagOStuff.php
diff --git
a/includes/objectcache/BagOStuff.php
b/includes/objectcache/BagOStuff.php
index
f6fe243
..
217142c
100644
(file)
--- a/
includes/objectcache/BagOStuff.php
+++ b/
includes/objectcache/BagOStuff.php
@@
-3,7
+3,7
@@
* Classes to cache objects in PHP accelerators, SQL database or DBA files
*
* Copyright © 2003-2004 Brion Vibber <brion@pobox.com>
* Classes to cache objects in PHP accelerators, SQL database or DBA files
*
* Copyright © 2003-2004 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * http
s
://www.mediawiki.org/
*
* 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
*
* 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
@@
-142,7
+142,7
@@
abstract class BagOStuff {
* @return bool success
*/
protected function mergeViaLock( $key, closure $callback, $exptime = 0, $attempts = 10 ) {
* @return bool success
*/
protected function mergeViaLock( $key, closure $callback, $exptime = 0, $attempts = 10 ) {
- if ( !$this->lock( $key, 6
0
) ) {
+ if ( !$this->lock( $key, 6 ) ) {
return false;
}
return false;
}
@@
-168,7
+168,7
@@
abstract class BagOStuff {
* @param $timeout integer [optional]
* @return bool success
*/
* @param $timeout integer [optional]
* @return bool success
*/
- public function lock( $key, $timeout = 6
0
) {
+ public function lock( $key, $timeout = 6 ) {
$timestamp = microtime( true ); // starting UNIX timestamp
if ( $this->add( "{$key}:lock", 1, $timeout ) ) {
return true;
$timestamp = microtime( true ); // starting UNIX timestamp
if ( $this->add( "{$key}:lock", 1, $timeout ) ) {
return true;