Changeset 4410

Timestamp:

06/02/06 06:30:23 (2 years ago)

Author:

bitsweat

Message:

Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form). Closes #210.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 [mklame@atxeu.com, matthew@walker.wattle.id.au]
-
-* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [DHH]

trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -184 +184 @@
-      elsif value.respond_to?(:read)
-        # Value as part of a multipart request
-
+
+
+
-      elsif value.class == Array
-        value.collect { |v| CGIMethods.get_typed_value(v) }

trunk/actionpack/test/controller/cgi_test.rb

@@ -304 +304 @@
-  end
-
+  # Rewind readable cgi params so others may reread them (such as CGI::Session
+  # when passing the session id in a multipart form).
+  def test_multipart_param_rewound
+    params = process('text_file')
+    assert_equal 'bar', @cgi.params['foo'][0].read
+  end
+
-  private
-    def process(name)
@@ -310 +317 @@
-        ENV['CONTENT_LENGTH'] = file.stat.size.to_s
-        $stdin = file
-
+
+
-      end
-    ensure