From a6e3877b8a5abeefeab2efec3ba960dd6ae070f4 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Fri, 5 Feb 2021 09:09:55 +0530 Subject: [PATCH] DEV: use `request_path` instead of `script_name` to find static file requests. (#11986) `script_name` env variable would be empty for public static assets. --- config/initializers/008-rack-cors.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb index ae160149503..96ab5ba6197 100644 --- a/config/initializers/008-rack-cors.rb +++ b/config/initializers/008-rack-cors.rb @@ -32,9 +32,8 @@ class Discourse::Cors def self.apply_headers(cors_origins, env, headers) request_method = env['REQUEST_METHOD'] - cdn_endpoints = ["/assets", "/javascripts"] - if cdn_endpoints.include?(env['SCRIPT_NAME']) && Discourse.is_cdn_request?(env, request_method) + if env['REQUEST_PATH'] =~ /\/(javascripts|assets)\// && Discourse.is_cdn_request?(env, request_method) Discourse.apply_cdn_headers(headers) elsif cors_origins origin = nil