Changeset 6815

Timestamp:

05/23/07 05:43:00 (1 year ago)

Author:

bitsweat

Message:

Rewind request body after reading it, if possible. Closes #8438.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Rewind request body after reading it, if possible.  #8438 [s450r1]
-
-* Resource namespaces are inherited by their has_many subresources.  #8280 [marclove, ggarside]

trunk/actionpack/lib/action_controller/request.rb

@@ -331 +331 @@
-        # Only multipart form parsing expects a stream.
-        if strategy && strategy != :multipart_form
-
+
+
+
-        end
-

trunk/actionpack/test/controller/cgi_test.rb

@@ -69 +69 @@
-  end
-end
+
+
+class CgiRequestNeedsRewoundTest < BaseCgiTest
+  def test_body_should_be_rewound
+    data = 'foo'
+    fake_cgi = Struct.new(:env_table, :query_string, :stdinput).new(@request_hash, '', StringIO.new(data))
+    fake_cgi.env_table['CONTENT_LENGTH'] = data.length
+    fake_cgi.env_table['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+
+    # Read the request body by parsing params.
+    request = ActionController::CgiRequest.new(fake_cgi)
+    request.request_parameters
+
+    # Should have rewound the body.
+    assert_equal 0, request.body.pos
+  end
+end