Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99326
Change subject: Removed X-Images variance & legacy url params
......................................................................
Removed X-Images variance & legacy url params
* X-Images variance is never used anywhere, and cannot be
set in varnish without hardcoding X-CS knowledge or a lookup table
* render* url params are no longer used, and should not exist in cache
Change-Id: I397049e0b796bc2b432de9e6b4a1d7e35fa7b071
---
M includes/PageRenderingHooks.php
1 file changed, 7 insertions(+), 25 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/26/99326/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 6802595..e6564a5 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -328,15 +328,13 @@
wfProfileIn( __METHOD__ );
// @FIXME: Debug checks - should be remove once all issues are
gone
- if ( $this->getConfigId() === null ) {
- $warn = '';
- if ( $this->request->getCheck( 'renderZeroRatedBanner'
) ||
- $this->request->getCheck( 'acceptbilling' ) ||
- $this->request->getCheck( 'renderwarning' ) ||
- $this->request->getCheck(
'renderZeroRatedRedirect' )
- ) {
- $warn = ' && zero params in query';
- }
+ $hasObsoleteFlags =
+ $this->request->getCheck( 'acceptbilling' ) ||
+ $this->request->getCheck( 'renderwarning' ) ||
+ $this->request->getCheck( 'renderZeroRatedBanner' ) ||
+ $this->request->getCheck( 'renderZeroRatedRedirect' );
+ if ( $hasObsoleteFlags || $this->getConfigId() === null ) {
+ $warn = $hasObsoleteFlags ? 'zero params in query' : '';
if ( $this->isZeroSubdomain ) {
$referer = $this->request->getHeader( 'REFERER'
);
if ( strpos( $referer, 'zero.wikipedia.org' )
!== false ) {
@@ -362,23 +360,7 @@
$out->addVaryHeader( 'X-CS' );
$out->addVaryHeader( 'X-Subdomain' );
- $out->addVaryHeader( 'X-Images' );
$out->addVaryHeader( 'X-Forwarded-By' );
-
- // @FIXME: These should be removed in a month once cache clears
up
- if ( $this->request->getCheck( 'renderZeroRatedBanner' ) ||
- $this->request->getCheck( 'renderwarning' ) ||
- $this->request->getCheck( 'renderZeroRatedRedirect' ) )
- {
- $url = $this->request->getVal( 'returnto' );
- if ( $url ) {
- if ( !$this->request->getCheck( 'acceptbilling'
) ) {
- $url = $this->makeRedirect( $url );
- }
- $out->redirect( $url );
- $out->output();
- }
- }
// If zerodot isn't supported here and the user isn't already on
// Special:ZeroRatedMobileAccess, send the user to
Special:ZeroRatedMobileAccess
--
To view, visit https://gerrit.wikimedia.org/r/99326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I397049e0b796bc2b432de9e6b4a1d7e35fa7b071
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
