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 "Upgrade wikimedia/remex-html to 2.0.1" into REL1_31
[lhc/web/wiklou.git]
/
load.php
diff --git
a/load.php
b/load.php
index
c6452fb
..
1997fe7
100644
(file)
--- a/
load.php
+++ b/
load.php
@@
-23,6
+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
+// 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';
@@
-31,12
+36,19
@@
if ( !$wgRequest->checkUrlExtension() ) {
return;
}
return;
}
-// Respond to ResourceLoader request
+// 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' ),
LoggerFactory::getInstance( 'resourceloader' )
);
$resourceLoader = new ResourceLoader(
ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
LoggerFactory::getInstance( 'resourceloader' )
);
-$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
+$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
+
+// Respond to ResourceLoader request
+$resourceLoader->respond( $context );
Profiler::instance()->setTemplated( true );
Profiler::instance()->setTemplated( true );