Permalink
Browse files

Make the xml_http_request testing method set the HTTP_ACCEPT header

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3867 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 4965a75 commit 953d7c9aa4f1cf9ec16cbfcdeb2b1703df7d51a3 @jamis jamis committed Mar 14, 2006
Showing with 4 additions and 0 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −0 actionpack/lib/action_controller/test_process.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Make the xml_http_request testing method set the HTTP_ACCEPT header [Jamis Buck]
+
* Add Verification to scaffolds. Prevent destructive actions using GET [Michael Koziarski]
* Avoid hitting the filesystem when using layouts by using a File.directory? cache. [Stefan Kaes, Nicholas Seckar]
@@ -317,8 +317,10 @@ def process(action, parameters = nil, session = nil, flash = nil)
def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
@request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+ @request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*'
returning self.send(request_method, action, parameters, session, flash) do
@request.env.delete 'HTTP_X_REQUESTED_WITH'
+ @request.env.delete 'HTTP_ACCEPT'
end
end
alias xhr :xml_http_request

0 comments on commit 953d7c9

Please sign in to comment.