Merge pull request rails#8907 from rubys/master

Fix regression introduced in pull 8812
sgrgic · Jan 11, 2013 · c1d7225 · c1d7225
2 parents 7738222 + c692774
commit c1d7225
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -6,7 +6,8 @@ class FileHandler
     def initialize(root, cache_control)
       @root          = root.chomp('/')
       @compiled_root = /^#{Regexp.escape(root)}/
-      @file_server   = ::Rack::File.new(@root, 'Cache-Control' => cache_control)
+      headers = cache_control && { 'Cache-Control' => cache_control }
+      @file_server   = ::Rack::File.new(@root, headers)
     end
 
     def match?(path)