Reenable the use of the Accept header to give people a chance to upda…

…te their applications and provide feedback.

actionpack/CHANGELOG

@@ -4,15 +4,16 @@
 
 * Add :recursive option to javascript_include_tag and stylesheet_link_tag to be used along with :all. #480 [Damian Janowski]
 
-* Disable the Accept header by default [Michael Koziarski]
+* Allow users to disable the use of the Accept header [Michael Koziarski]
 
     The accept header is poorly implemented by browsers and causes strange
 	errors when used on public sites where crawlers make requests too.  You
-	should use formatted urls (e.g. /people/1.xml) to support API clients.
+	can use formatted urls (e.g. /people/1.xml) to support API clients in a
+	much simpler way.
 
-	Alternatively to re-enable it you need to set:
+	To disable the header you need to set:
 
-	config.action_controller.use_accept_header = true
+	config.action_controller.use_accept_header = false
 
 * Do not stat template files in production mode before rendering. You will no longer be able to modify templates in production mode without restarting the server [Josh Peek]
 

actionpack/lib/action_controller/base.rb

@@ -343,12 +343,12 @@ class Base
     # Indicates whether the response format should be determined by examining the Accept HTTP header,
     # or by using the simpler params + ajax rules.
     #
-    # If this is set to +true+ then +respond_to+ and +Request#format+ will take the Accept header into
-    # account.  If it is set to false (the default) then the request format will be determined solely
+    # If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept
+    # header into account.  If it is set to false then the request format will be determined solely
     # by examining params[:format].  If params format is missing, the format will be either HTML or
     # Javascript depending on whether the request is an AJAX request.
     cattr_accessor :use_accept_header
-    self.use_accept_header = false
+    self.use_accept_header = true
 
     # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
     class_inheritable_accessor :allow_forgery_protection