From 83e35b9c08b97db7605542e69a8fa8d23c7df211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 2 May 2011 23:38:39 +0200
Subject: Allow ignore_accept_header through configuration option.

---
 actionpack/lib/action_dispatch/railtie.rb       |  2 ++
 railties/test/application/configuration_test.rb | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 0a3bd5fe40..f51cc3711b 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -9,10 +9,12 @@ module ActionDispatch
     config.action_dispatch.show_exceptions = true
     config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
+    config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rack_cache = {:metastore => "rails:/", :entitystore => "rails:/", :verbose => true}
 
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
+      ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
     end
   end
 end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 8f96f4c57b..b1f7076776 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -442,5 +442,26 @@ module ApplicationTests
 
       assert_equal [:json], ActionController::Base._wrapper_options[:format]
     end
+
+    test "config.action_dispatch.ignore_accept_header" do
+      make_basic_app do |app|
+        app.config.action_dispatch.ignore_accept_header = true
+      end
+
+      class ::OmgController < ActionController::Base
+        def index
+          respond_to do |format|
+            format.html { render :text => "HTML" }
+            format.xml { render :text => "XML" }
+          end
+        end
+      end
+
+      get "/", {}, "HTTP_ACCEPT" => "application/xml"
+      assert_equal 'HTML', last_response.body
+
+      get "/", { :format => :xml }, "HTTP_ACCEPT" => "application/xml"
+      assert_equal 'XML', last_response.body
+    end
   end
 end
-- 
cgit v1.2.3