aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-12-17 00:06:24 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-12-17 00:06:24 +0000
commit26e10218bc5e5c899b88f8d08b8abfb251b3af10 (patch)
treead47d9e35f6d1491536ba5c90dad7440aab5ce27 /actionpack/lib/action_controller
parentc92a7cea058bf24d234bbac3ca814e793f40c099 (diff)
downloadrails-26e10218bc5e5c899b88f8d08b8abfb251b3af10.tar.gz
rails-26e10218bc5e5c899b88f8d08b8abfb251b3af10.tar.bz2
rails-26e10218bc5e5c899b88f8d08b8abfb251b3af10.zip
Added OPTIONS to list of default accepted HTTP methods (closes #10449) [holoway]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
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