jenkins-bot has submitted this change and it was merged.
Change subject: Vary the cache based upon source proxy.
......................................................................
Vary the cache based upon source proxy.
* See also I7f4d02f7c3f054079c8f4a9f683f42a18c83b0a9.
* See also I5120597b30eafddc3dbd434fb8d55bee82c47295.
* Extra vary headers added for the API and special page, too.
Change-Id: Id2cd41a8fcf482b494c53eb4b9187c6b7f427e95
---
M includes/ApiZeroConfig.php
M includes/PageRenderingHooks.php
M includes/ZeroSpecialPage.php
3 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiZeroConfig.php b/includes/ApiZeroConfig.php
index 2db0062..adfb69d 100644
--- a/includes/ApiZeroConfig.php
+++ b/includes/ApiZeroConfig.php
@@ -40,7 +40,10 @@
} else {
$result->addValue( null, 'enabled',
false );
}
- $result->getOutput()->addVaryHeader( 'X-CS' );
+ $out = $result->getOutput();
+ $out->addVaryHeader( 'X-CS' );
+ $out->addVaryHeader( 'X-Subdomain' );
+ $out->addVaryHeader( 'X-Forwarded-By' );
break;
case 'ips':
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 5d4f0a6..73dac72 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -345,6 +345,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' ) ||
diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 08ffb2a..5420891 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -38,6 +38,7 @@
$this->setHeaders();
$out->addVaryHeader( 'X-CS' );
$out->addVaryHeader( 'X-Subdomain' );
+ $out->addVaryHeader( 'X-Forwarded-By' );
// fixme: needs lower varnish caching time
$this->state = PageRenderingHooks::getState(
$this->getContext() );
--
To view, visit https://gerrit.wikimedia.org/r/88264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2cd41a8fcf482b494c53eb4b9187c6b7f427e95
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: MaxSem <[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
