This change causes some failing tests, but it should be possible to make them pass with minimal performance impact.

2 files changed, 16 insertions, 13 deletions

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 4190fa21cd..958a541436 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -176,17 +176,18 @@ module ActionDispatch
     # Expand raw_formats by converting Mime::ALL to the Mime::SET.
     #
     def formats
-      if ActionController::Base.use_accept_header
-        raw_formats.tap do |ret|
-          if ret == ONLY_ALL
-            ret.replace Mime::SET
-          elsif all = ret.index(Mime::ALL)
-            ret.delete_at(all) && ret.insert(all, *Mime::SET)
-          end
-        end
-      else
-        raw_formats + Mime::SET
-      end
+      return raw_formats
+      # if ActionController::Base.use_accept_header
+      #   raw_formats.tap do |ret|
+      #     if ret == ONLY_ALL
+      #       ret.replace Mime::SET
+      #     elsif all = ret.index(Mime::ALL)
+      #       ret.delete_at(all) && ret.insert(all, *Mime::SET)
+      #     end
+      #   end
+      # else
+      #   raw_formats + Mime::SET
+      # end
     end
 
     # Sets the \format by string extension, which can be used to force custom formats
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index ebfc6cc8ce..3bd2acae7a 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -41,8 +41,10 @@ module ActionView
     end
 
     def handler_glob
-      e = TemplateHandlers.extensions.map{|h| ".#{h},"}.join
-      "{#{e}}"
+      @handler_glob ||= begin
+        e = TemplateHandlers.extensions.map{|h| ".#{h},"}.join
+        "{#{e}}"
+      end
     end
     
     def formats_glob