Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/396444 )
Change subject: Revert "Make ChronologyProtector actually use cpPosTime cookies"
......................................................................
Revert "Make ChronologyProtector actually use cpPosTime cookies"
This reverts commit c46fa4c474035779cd8b4a961f0f6941ef102a1c.
Bug: T182322
Change-Id: If997b02916dbc513843871ed108a88d8362f8bfb
---
M includes/Setup.php
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/libs/rdbms/lbfactory/LBFactory.php
3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/396444/1
diff --git a/includes/Setup.php b/includes/Setup.php
index 081ea68..4c281b1 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -734,18 +734,13 @@
$wgDBerrorLogTZ = $wgLocaltimezone;
}
-// Initialize the request object in $wgRequest
+// initialize the request object in $wgRequest
$wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
// Set user IP/agent information for causal consistency purposes
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
'IPAddress' => $wgRequest->getIP(),
'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
- 'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection'
),
- // The cpPosTime cookie has no prefix and is set by
MediaWiki::preOutputCommit()
- 'ChronologyPositionTime' => $wgRequest->getFloat(
- 'cpPosTime',
- $wgRequest->getCookie( 'cpPosTime', '' )
- )
+ 'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection'
)
] );
// Useful debug output
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php
b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 697af0e..f6d080e 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -319,7 +319,6 @@
* - IPAddress : IP address
* - UserAgent : User-Agent HTTP header
* - ChronologyProtection : cookie/header value specifying
ChronologyProtector usage
- * - ChronologyPositionTime: timestamp used to get up-to-date DB
positions for the agent
*/
public function setRequestInfo( array $info );
}
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php
b/includes/libs/rdbms/lbfactory/LBFactory.php
index ef716b6..c891fb6 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -115,8 +115,7 @@
$this->requestInfo = [
'IPAddress' => isset( $_SERVER[ 'REMOTE_ADDR' ] ) ?
$_SERVER[ 'REMOTE_ADDR' ] : '',
'UserAgent' => isset( $_SERVER['HTTP_USER_AGENT'] ) ?
$_SERVER['HTTP_USER_AGENT'] : '',
- 'ChronologyProtection' => 'true',
- 'ChronologyPositionTime' => isset( $_GET['cpPosTime'] )
? $_GET['cpPosTime'] : null
+ 'ChronologyProtection' => 'true'
];
$this->cliMode = isset( $conf['cliMode'] ) ? $conf['cliMode'] :
PHP_SAPI === 'cli';
@@ -441,7 +440,7 @@
'ip' => $this->requestInfo['IPAddress'],
'agent' => $this->requestInfo['UserAgent'],
],
- $this->requestInfo['ChronologyPositionTime']
+ isset( $_GET['cpPosTime'] ) ? $_GET['cpPosTime'] : null
);
$this->chronProt->setLogger( $this->replLogger );
--
To view, visit https://gerrit.wikimedia.org/r/396444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If997b02916dbc513843871ed108a88d8362f8bfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
