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 "API: Account for PHP 7.2 change"
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
e4396ba
..
d6f4b2f
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-37,8
+37,11
@@
if ( !defined( 'MEDIAWIKI' ) ) {
* Pre-config setup: Before loading LocalSettings.php
*/
* Pre-config setup: Before loading LocalSettings.php
*/
-// Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
+// Get profiler configuraton
+$wgProfiler = [];
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+ require "$IP/StartProfiler.php";
+}
// Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
// Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
@@
-46,12
+49,6
@@
require_once "$IP/includes/AutoLoader.php";
// Load up some global defines
require_once "$IP/includes/Defines.php";
// Load up some global defines
require_once "$IP/includes/Defines.php";
-// Start the profiler
-$wgProfiler = [];
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
- require "$IP/StartProfiler.php";
-}
-
// Load default settings
require_once "$IP/includes/DefaultSettings.php";
// Load default settings
require_once "$IP/includes/DefaultSettings.php";
@@
-737,14
+734,22
@@
if ( !$wgDBerrorLogTZ ) {
$wgDBerrorLogTZ = $wgLocaltimezone;
}
$wgDBerrorLogTZ = $wgLocaltimezone;
}
-//
i
nitialize the request object in $wgRequest
+//
I
nitialize the request object in $wgRequest
$wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
$wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
-// Set user IP/agent information for causal consistency purposes
+// Set user IP/agent information for causal consistency purposes.
+// The cpPosTime cookie has no prefix and is set by MediaWiki::preOutputCommit().
+$cpPosTime = $wgRequest->getFloat( 'cpPosTime', $wgRequest->getCookie( 'cpPosTime', '' ) );
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
- 'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' )
+ 'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' ),
+ 'ChronologyPositionTime' => $cpPosTime
] );
] );
+// Make sure that caching does not compromise the consistency improvements
+if ( $cpPosTime ) {
+ MediaWikiServices::getInstance()->getMainWANObjectCache()->useInterimHoldOffCaching( false );
+}
+unset( $cpPosTime );
// Useful debug output
if ( $wgCommandLineMode ) {
// Useful debug output
if ( $wgCommandLineMode ) {