1 files changed, 14 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index d9b63faf5e..6610315da7 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -4,10 +4,19 @@ require 'active_support/core_ext/hash/indifferent_access'
 module ActionDispatch
   module Http
     module Parameters
+      def initialize(env)
+        super
+        @symbolized_path_params = nil
+      end
+
       # Returns both GET and POST \parameters in a single hash.
       def parameters
         @env["action_dispatch.request.parameters"] ||= begin
-          params = request_parameters.merge(query_parameters)
+          params = begin
+            request_parameters.merge(query_parameters)
+          rescue EOFError
+            query_parameters.dup
+          end
           params.merge!(path_parameters)
           encode_params(params).with_indifferent_access
         end
@@ -35,6 +44,10 @@ module ActionDispatch
         @env["action_dispatch.request.path_parameters"] ||= {}
       end
 
+      def reset_parameters #:nodoc:
+        @env.delete("action_dispatch.request.parameters")
+      end
+
     private
 
       # TODO: Validate that the characters are UTF-8. If they aren't,