Add ignore_accept_header config to AD::Request.

2 files changed, 44 insertions, 5 deletions

diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 68ba1a81b5..980c658ab7 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -1,6 +1,13 @@
 module ActionDispatch
   module Http
     module MimeNegotiation
+      extend ActiveSupport::Concern
+
+      included do
+        mattr_accessor :ignore_accept_header
+        self.ignore_accept_header = false
+      end
+
       # The MIME type of the HTTP request, such as Mime::XML.
       #
       # For backward compatibility, the post \format is extracted from the
@@ -42,16 +49,14 @@ module ActionDispatch
         formats.first
       end
 
-      BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
-
       def formats
-        accept = @env['HTTP_ACCEPT']
-
         @env["action_dispatch.request.formats"] ||=
           if parameters[:format]
             Array(Mime[parameters[:format]])
-          elsif xhr? || (accept && accept !~ BROWSER_LIKE_ACCEPTS)
+          elsif use_accept_header && valid_accept_header
             accepts
+          elsif xhr?
+            [Mime::JS]
           else
             [Mime::HTML]
           end
@@ -87,6 +92,18 @@ module ActionDispatch
 
         order.include?(Mime::ALL) ? formats.first : nil
       end
+
+      protected
+
+      BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
+
+      def valid_accept_header
+        xhr? || (accept && accept !~ BROWSER_LIKE_ACCEPTS)
+      end
+
+      def use_accept_header
+        !self.class.ignore_accept_header
+      end
     end
   end
 end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index f03ae7f2b3..86bbbab175 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -452,6 +452,28 @@ class RequestTest < ActiveSupport::TestCase
     assert request.formats.empty?
   end
 
+  test "ignore_accept_header" do
+    ActionDispatch::Request.ignore_accept_header = true
+
+    begin
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml'
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::HTML ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml',
+                             'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::JS ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml',
+                             'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+      request.expects(:parameters).at_least_once.returns({:format => :json})
+      assert_equal [ Mime::JSON ], request.formats
+    ensure
+      ActionDispatch::Request.ignore_accept_header = false
+    end
+  end
+
   test "negotiate_mime" do
     request = stub_request 'HTTP_ACCEPT' => 'text/html',
                            'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"