jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400204 )
Change subject: Mutate $wgServer after applying local settings
......................................................................
Mutate $wgServer after applying local settings
Move the block introduced in 8c7bf33 and updated in 990f03a which sets
$wgServer relative to current request headers and trims the protocol if
the deployment supports HTTP and HTTPS *after* the user and Puppet
managed local settings files are processed.
Bug: T183302
Change-Id: I381b9b1ea910c8b96cc4c4186e5f91ae64a5372c
---
M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
index 6eaaa3c..3b61f12 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
@@ -54,15 +54,6 @@
),
);
-if ( PHP_SAPI !== 'cli' ) {
- // T68399: set wgServer from inbound request
- $wgServer = WebRequest::detectServer();
- if ( isset( $mwvSupportsHttps ) && $mwvSupportsHttps ) {
- // Create protocol-relative URL when the HTTPS role is active
- $wgServer = preg_replace( '#^https?:#', '', $wgServer );
- }
-}
-
/**
* @var array $wmvActiveExtensions List of extensions enabled for the wiki
* Populated by settings.d files generated by ::mediawiki::extension and
@@ -82,3 +73,13 @@
) {
include_once $conffile;
}
+
+// T183302: Mutate $wgServer *after* local settings changes
+if ( PHP_SAPI !== 'cli' ) {
+ // T68399: set wgServer from inbound request
+ $wgServer = WebRequest::detectServer();
+ if ( isset( $mwvSupportsHttps ) && $mwvSupportsHttps ) {
+ // Create protocol-relative URL when the HTTPS role is active
+ $wgServer = preg_replace( '#^https?:#', '', $wgServer );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/400204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I381b9b1ea910c8b96cc4c4186e5f91ae64a5372c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
