jenkins-bot has submitted this change and it was merged.
Change subject: Further Opera slot logging
......................................................................
Further Opera slot logging
Change-Id: Ifa42a310789fdd1bfe5d6f2bf0b7fd0be399cfd8
---
M includes/PageRendering.php
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 096f90b..4aaeda0 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -257,10 +257,13 @@
$hasObsoleteFlags =
$request->getCheck( 'acceptbilling' ) ||
$request->getCheck( 'renderwarning' ) ||
$request->getCheck( 'renderZeroRatedBanner' ) ||
$request->getCheck( 'renderZeroRatedRedirect' );
- $hasOperaRoute = $request->getHeader( 'X-OPERAMINI-ROUTE' ) !==
false;
+ // For Zero traffic, either it should come from Opera AND have
slot, or should be neither.
+ // For non-Zero traffic, it should not have opera route
$forwardedByOpera = $request->getHeader( 'X-Forwarded-By' ) ===
'Opera';
+ $hasOperaRoute = $request->getHeader( 'X-OPERAMINI-ROUTE' ) !==
false;
$isBadOperaSlot = $isZeroHandledRequest && $forwardedByOpera
!== $hasOperaRoute;
- if ( $hasObsoleteFlags || $this->getConfigId() === null ||
$isBadOperaSlot ) {
+ $unknownOpera = !$isZeroHandledRequest && $hasOperaRoute;
+ if ( $hasObsoleteFlags || $this->getConfigId() === null ||
$isBadOperaSlot || $unknownOpera ) {
$warn = $hasObsoleteFlags ? 'zero params in query' : '';
if ( $this->isZeroSubdomain ) {
$referer = $request->getHeader( 'REFERER' );
@@ -269,7 +272,9 @@
}
}
if ( $isBadOperaSlot ) {
- $warn .= $hasOperaRoute ? '&&
unidentified-opera-with-slot' : '&& bad-opera-slot';
+ $warn .= $hasOperaRoute ? '&& opera-route' :
'&& no-opera-route';
+ } elseif ( $unknownOpera ) {
+ $warn .= ' && undetected-opera';
}
$ua = $request->getHeader( 'USER-AGENT' );
if ( $warn !== '' && $request->getHeader( 'FROM' ) !==
'googlebot(at)googlebot.com' &&
--
To view, visit https://gerrit.wikimedia.org/r/146071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa42a310789fdd1bfe5d6f2bf0b7fd0be399cfd8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
