Merge remote-tracking branch 'upstream/pull/5725'

[rails.git] / config / initializers / cors.rb

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index fdbf11a2ce05cacaaffcdd4a90a822518be92e81..710e2c00950e9e6c568bec3e57238d775462b8aa 100644 (file)
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -6,7 +6,7 @@
 module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)
 module OpenStreetMap
   class Cors < Rack::Cors
     def call(env)

-      status, headers, body = super(env)
+      status, headers, body = super

       headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]
       [status, headers, body]
     end
       headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"]
       [status, headers, body]
     end


@@ -30,5 +30,6 @@ Rails.application.config.middleware.insert_before 0, OpenStreetMap::Cors do
     resource "/diary/*/rss", :headers => :any, :methods => [:get]
     resource "/trace/*/data", :headers => :any, :methods => [:get]
     resource "/user/*/diary/rss", :headers => :any, :methods => [:get]
     resource "/diary/*/rss", :headers => :any, :methods => [:get]
     resource "/trace/*/data", :headers => :any, :methods => [:get]
     resource "/user/*/diary/rss", :headers => :any, :methods => [:get]

+    resource "/rails/active_storage/*", :headers => :any, :methods => [:get]

   end
 end
   end
 end