Changeset 9113

Timestamp:

03/28/08 19:55:31 (7 months ago)

Author:

david

Message:

Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes (closes #10886) [ariejan]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes #10886 [ariejan]
-
-* Fixed HTML::Tokenizer (used in sanitize helper) didn't handle unclosed CDATA tags #10071 [esad, packagethief]

trunk/actionpack/lib/action_controller/request.rb

@@ -586 +586 @@
-              params[name] = [content]
-            end
-            break if buf.size == 0
-            break if content_length == -1
-          end

trunk/actionpack/test/controller/request_test.rb

@@ -602 +602 @@
-      "ie_products[file]" => [ ie_file ],
-      "text_part" => [non_file_text_part]
-
+  
-
-    expected_output =  {
@@ -745 +745 @@
-  end
-
+  def test_boundary_problem_file
+    params = process('boundary_problem_file')
+    assert_equal %w(file foo), params.keys.sort
+
+    file = params['file']
+    foo  = params['foo']
+    
+    if RUBY_VERSION > '1.9'
+      assert_kind_of File, file
+    else
+      assert_kind_of Tempfile, file
+    end
+    
+    assert_equal 'file.txt', file.original_filename
+    assert_equal "text/plain", file.content_type
+    
+    assert_equal 'bar', foo
+  end
+  
-  def test_large_text_file
-    params = process('large_text_file')