Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368226 )
Change subject: wmcs: Fix double Access-Control-Allow-Origin headers for
tools-static
......................................................................
wmcs: Fix double Access-Control-Allow-Origin headers for tools-static
Follow up to 8dad3bde99, d549ed5737. The upstream servers add
Access-Control-Allow-Origin headers when appropriate. When we add one as
well browsers freak out because they see "*, *" instead of "*" after the
duplicate headers are merged. Adding the header ourselves was copy-pasta
from the cdnjs rules where we are the origin and the header is needed.
Bug: T110027
Change-Id: I9103e68560dfd9e5fba5f0cbb8c193f90610c4ab
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index e98e7ea..0a18162 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -88,10 +88,6 @@
# And hide the referrer for privacy reasons
proxy_set_header Referer "https://<%= @web_domain %>/fontcdn/";
- add_header Access-Control-Allow-Origin '*';
-
- # rewrite is an action directive and does not inherit
-
# Proxy /fontcdn/css to fonts.googleapis.com
location ^~ /fontcdn/css {
rewrite ^/fontcdn(/.*)$ $1 break;
--
To view, visit https://gerrit.wikimedia.org/r/368226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9103e68560dfd9e5fba5f0cbb8c193f90610c4ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Coren <m...@uberbox.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
