* Change the object used in routing constraints to be an instance of

  ActionDispatch::Request rather than Rack::Request.

* Changed ActionDispatch::Request#method to return a String, to be
  compatible with the Rack::Request superclass.

* Changed ActionDispatch::Request#method to return the original
  method in the case of methodoverride and #request_method not to,
  to be compatible with Rack::Request

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 0b2cee6868..d97c10a293 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -216,7 +216,7 @@ module ActionController #:nodoc:
     # the verb is POST.
     #
     def default_action
-      @action ||= ACTIONS_FOR_VERBS[request.method]
+      @action ||= ACTIONS_FOR_VERBS[request.method_symbol]
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/verification.rb b/actionpack/lib/action_controller/metal/verification.rb
index bce942b588..b7fc2b7421 100644
--- a/actionpack/lib/action_controller/metal/verification.rb
+++ b/actionpack/lib/action_controller/metal/verification.rb
@@ -108,7 +108,7 @@ module ActionController #:nodoc:
     end
 
     def verify_method(options) # :nodoc:
-      [*options[:method]].all? { |v| request.method != v.to_sym } if options[:method]
+      [*options[:method]].all? { |v| request.method_symbol != v.to_sym } if options[:method]
     end
 
     def verify_request_xhr_status(options) # :nodoc: