jenkins-bot has submitted this change and it was merged.
Change subject: Vary on X-Forwarded-Proto for changing-protocol redirects
......................................................................
Vary on X-Forwarded-Proto for changing-protocol redirects
Same idea as in Ie6dc9da4.
Change-Id: Ie7ad1eff74fbadce04d11e92ab30d1d0b29f7426
---
M specials/SpecialCentralAutoLogin.php
M specials/SpecialCentralLogin.php
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Mark Bergsma: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/specials/SpecialCentralAutoLogin.php
b/specials/SpecialCentralAutoLogin.php
index 53a55a3..07635f1 100644
--- a/specials/SpecialCentralAutoLogin.php
+++ b/specials/SpecialCentralAutoLogin.php
@@ -24,6 +24,7 @@
) {
$redirUrl = str_replace( 'http://', 'https://',
$request->getFullRequestURL() );
$output = $this->getOutput();
+ $output->addVaryHeader( 'X-Forwarded-Proto' );
$output->redirect( $redirUrl );
$output->output();
return;
diff --git a/specials/SpecialCentralLogin.php b/specials/SpecialCentralLogin.php
index 5177908..887bf07 100644
--- a/specials/SpecialCentralLogin.php
+++ b/specials/SpecialCentralLogin.php
@@ -16,6 +16,7 @@
) {
$redirUrl = str_replace( 'http://', 'https://',
$request->getFullRequestURL() );
$output = $this->getOutput();
+ $output->addVaryHeader( 'X-Forwarded-Proto' );
$output->redirect( $redirUrl );
$output->output();
return;
--
To view, visit https://gerrit.wikimedia.org/r/90543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7ad1eff74fbadce04d11e92ab30d1d0b29f7426
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
