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 "objectcache: avoid duplicate set() calls with lockTSE when no value is in...
[lhc/web/wiklou.git]
/
load.php
diff --git
a/load.php
b/load.php
index
2b97f7a
..
1997fe7
100644
(file)
--- a/
load.php
+++ b/
load.php
@@
-23,11
+23,11
@@
*/
use MediaWiki\Logger\LoggerFactory;
*/
use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
// This endpoint is supposed to be independent of request cookies and other
// This endpoint is supposed to be independent of request cookies and other
-// details of the session. Log warnings for violations of the no-session
-// constraint.
-define( 'MW_NO_SESSION', 'warn' );
+// details of the session. Enforce this constraint with respect to session use.
+define( 'MW_NO_SESSION', 1 );
require __DIR__ . '/includes/WebStart.php';
require __DIR__ . '/includes/WebStart.php';
@@
-36,6
+36,10
@@
if ( !$wgRequest->checkUrlExtension() ) {
return;
}
return;
}
+// Disable ChronologyProtector so that we don't wait for unrelated MediaWiki
+// writes when getting database connections for ResourceLoader. (T192611)
+MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
+
// Set up ResourceLoader
$resourceLoader = new ResourceLoader(
ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
// Set up ResourceLoader
$resourceLoader = new ResourceLoader(
ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),