aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-23 05:43:00 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-23 05:43:00 +0000
commitb0d01921d8fe5d54d90c9bf4aa77ba819ab52a97 (patch)
treeb428af7b730039f629d94d76864dab1ad5daa526 /actionpack/lib/action_controller
parentd418b7d39139bb881c37f0f095788ec034b98965 (diff)
downloadrails-b0d01921d8fe5d54d90c9bf4aa77ba819ab52a97.tar.gz
rails-b0d01921d8fe5d54d90c9bf4aa77ba819ab52a97.tar.bz2
rails-b0d01921d8fe5d54d90c9bf4aa77ba819ab52a97.zip
Rewind request body after reading it, if possible. Closes #8438.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6815 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/request.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 0dfc4a91d0..476f65a6dc 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -330,7 +330,9 @@ module ActionController
# Only multipart form parsing expects a stream.
if strategy && strategy != :multipart_form
- body = body.read(content_length)
+ data = body.read(content_length)
+ body.rewind if body.respond_to?(:rewind)
+ body = data
end
case strategy