Fix for issue #1657. Include ActionDispatch::Static when running WEBr…

…ick in production mode
rails · Jun 14, 2011 · 55e9cbc · 55e9cbc
1 parent deff597
commit 55e9cbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
@@ -150,7 +150,8 @@ def default_middleware_stack
           middleware.use ::Rack::SSL
         end
 
-        if config.serve_static_assets
+        running_webrick = Rails::Info.properties.value_for("Server") == ActiveSupport::Inflector.demodulize(::Rack::Handler::WEBrick)
+        if config.serve_static_assets || running_webrick && Rails.env == "production"
           middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
         end
 

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
@@ -51,6 +51,7 @@
     # otherwise the --environment option given to the server won't propagate.
     require APP_PATH
     Dir.chdir(Rails.application.root)
+    Rails::Info.property("Server", ActiveSupport::Inflector.demodulize(server.server))
     server.start
   }