Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133043
Change subject: Fixed domain name for cookie deletion and removed logout
......................................................................
Fixed domain name for cookie deletion and removed logout
Change-Id: Ie342da95acac5c2bff182249b9d0cb092b3c782e
---
M includes/PageRenderingHooks.php
1 file changed, 11 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/43/133043/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 886ae4c..2eaa59f 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -977,25 +977,22 @@
// For zero.wikipedia.org, remove forceHTTPS cookie and
user state
if ( $this->isZeroSubdomain && !$config['enableHttps']
) {
$protocol = PROTO_HTTP;
- $user = \User::newFromSession( $this->request );
- $isUserReqHttps = $user->isLoggedIn() &&
$user->requiresHTTPS();
// This code should be kept in sync with
\MediaWiki::main()
- if (
+ $deleteCookies =
$this->request->getCookie(
'forceHTTPS', '' ) ||
// check for prefixed version for
currently logged in users
- $this->request->getCookie( 'forceHTTPS'
) ||
+ $this->request->getCookie( 'forceHTTPS'
);
+ if ( !$deleteCookies ) {
+ $user = \User::newFromSession(
$this->request );
// Avoid checking the user and groups
unless it's enabled.
- $isUserReqHttps
- ) {
- $time = time();
+ $deleteCookies = $user->isLoggedIn() &&
$user->requiresHTTPS();
+ }
+ if ( $deleteCookies ) {
+ $time = time() - 86400;
$resp = $this->request->response();
- $resp->setcookie( 'forceHTTPS', '',
$time - 86400 );
- $resp->setcookie( 'forceHTTPS', '',
$time - 86400, array( 'prefix' => '' ) );
- if ( $isUserReqHttps ) {
- $resp->setcookie( 'UserID', '',
$time - 86400 );
- $resp->setcookie( 'Token', '',
$time - 86400 );
- $resp->setcookie( 'LoggedOut',
$time, $time + 86400 );
- }
+ $resp->setcookie( 'forceHTTPS', '',
$time, array( 'domain' => '.wikipedia.org' ) );
+ $resp->setcookie( 'forceHTTPS', '',
$time,
+ array( 'prefix' => '', 'domain'
=> '.wikipedia.org' ) );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie342da95acac5c2bff182249b9d0cb092b3c782e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
