5 files changed, 47 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8dc01ba792..3bb755376f 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -74,6 +74,7 @@ module ActionController
   autoload :Translation, 'action_controller/translation'
   autoload :UrlRewriter, 'action_controller/url_rewriter'
   autoload :UrlWriter, 'action_controller/url_rewriter'
+  autoload :VerbPiggybacking, 'action_controller/verb_piggybacking'
   autoload :Verification, 'action_controller/verification'
 
   module Assertions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 701b464c99..71e2524e81 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -2,6 +2,17 @@ require 'stringio'
 require 'uri'
 require 'active_support/test_case'
 
+# Monkey patch Rack::Lint to support rewind
+module Rack
+  class Lint
+    class InputWrapper
+      def rewind
+        @input.rewind
+      end
+    end
+  end
+end
+
 module ActionController
   module Integration #:nodoc:
     # An integration Session instance represents a set of requests and responses
diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb
index e566c6fef9..793739723f 100644
--- a/actionpack/lib/action_controller/middlewares.rb
+++ b/actionpack/lib/action_controller/middlewares.rb
@@ -17,3 +17,5 @@ use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) }
       }
     )
 end
+
+use ActionController::VerbPiggybacking
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 2cad7bc84c..d9eb5af849 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -45,8 +45,6 @@ module ActionController
     # UnknownHttpMethod is raised for invalid methods not listed in ACCEPTED_HTTP_METHODS.
     def request_method
       method = @env['REQUEST_METHOD']
-      method = parameters[:_method] if method == 'POST' && !parameters[:_method].blank?
-
       HTTP_METHOD_LOOKUP[method] || raise(UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence}")
     end
     memoize :request_method
@@ -143,15 +141,15 @@ module ActionController
     # supplied, both must match, or the request is not considered fresh.
     def fresh?(response)
       case
-      when if_modified_since && if_none_match 
-        not_modified?(response.last_modified) && etag_matches?(response.etag) 
-      when if_modified_since 
-        not_modified?(response.last_modified) 
-      when if_none_match 
-        etag_matches?(response.etag) 
-      else 
-        false 
-      end 
+      when if_modified_since && if_none_match
+        not_modified?(response.last_modified) && etag_matches?(response.etag)
+      when if_modified_since
+        not_modified?(response.last_modified)
+      when if_none_match
+        etag_matches?(response.etag)
+      else
+        false
+      end
     end
 
     # Returns the Mime type for the \format used in the request.
diff --git a/actionpack/lib/action_controller/verb_piggybacking.rb b/actionpack/lib/action_controller/verb_piggybacking.rb
new file mode 100644
index 0000000000..86cde304a0
--- /dev/null
+++ b/actionpack/lib/action_controller/verb_piggybacking.rb
@@ -0,0 +1,24 @@
+module ActionController
+  # TODO: Use Rack::MethodOverride when it is released
+  class VerbPiggybacking
+    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env["REQUEST_METHOD"] == "POST"
+        req = Request.new(env)
+        if method = (req.parameters[:_method] || env["HTTP_X_HTTP_METHOD_OVERRIDE"])
+          method = method.to_s.upcase
+          if HTTP_METHODS.include?(method)
+            env["REQUEST_METHOD"] = method
+          end
+        end
+      end
+
+      @app.call(env)
+    end
+  end
+end