jenkins-bot has submitted this change and it was merged.
Change subject: Added a few test modes to test ESI bug on beta - should be
reverted
......................................................................
Added a few test modes to test ESI bug on beta - should be reverted
Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
---
M includes/PageRenderingHooks.php
1 file changed, 14 insertions(+), 5 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 2f900d0..b11e6e8 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -421,9 +421,8 @@
private function createBanner( $wap = false ) {
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
- if ( $wgZeroRatedMobileAccessEnableESI === true ||
- $this->request->getHeader( 'X-FORCE-ESI' ) === '1'
- ) {
+ $esiHeader = $this->request->getHeader( 'X-FORCE-ESI' );
+ if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this->request->response()->header( 'Enable-ESI: 1' );
@@ -432,9 +431,19 @@
if ( $wap ) {
$query .= '&wap=1';
}
- $url = $special->getLocalURL( $query );
+ if ( $esiHeader === 'TST' || $esiHeader === 'TSTAMP' ) {
+ $url = $special->getFullURL( $query );
+ } else {
+ $url = $special->getLocalURL( $query );
+ }
- return '<esi:include' . Html::expandAttributes( array(
'src' => $url, 'onerror' => 'continue' ) ) . '/>';
+ $esi = '<esi:include' . Html::expandAttributes( array(
'src' => $url, 'onerror' => 'continue' ) ) . '/>';
+
+ if ( $esiHeader === 'AMP' || $esiHeader === 'TSTAMP' ) {
+ $esi = str_replace( '&', '&', $esi );
+ }
+
+ return $esi;
}
$config = $this->getConfig();
if ( $config === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/91850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[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
