diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/request_test.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index cbf066228c..1a5e5c9687 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *2.0.2* (December 16th, 2007) +* Added OPTIONS to list of default accepted HTTP methods #10449 [holoway] + * Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [chuyeow]. Example: ActionController::Base.asset_host = Proc.new { |source| diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 785f6d424a..19948da9c2 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -4,7 +4,7 @@ require 'strscan' module ActionController # HTTP methods which are accepted by default. - ACCEPTED_HTTP_METHODS = Set.new(%w( get head put post delete )) + ACCEPTED_HTTP_METHODS = Set.new(%w( get head put post delete options )) # CgiRequest and TestRequest provide concrete implementations. class AbstractRequest diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb index 39ec2b47c1..698d3cbd2a 100644 --- a/actionpack/test/controller/request_test.rb +++ b/actionpack/test/controller/request_test.rb @@ -316,7 +316,7 @@ class RequestTest < Test::Unit::TestCase def test_allow_method_hacking_on_post set_request_method_to :post - [:get, :head, :put, :post, :delete].each do |method| + [:get, :head, :options, :put, :post, :delete].each do |method| @request.instance_eval { @parameters = { :_method => method } ; @request_method = nil } assert_equal(method == :head ? :get : method, @request.method) end |