Changeset 8327

Timestamp:

12/07/07 04:20:20 (9 months ago)

Author:

bitsweat

Message:

Ignore illegal seeks on body rewind. Catches CGI errors depending on your httpd. Closes #10404 [Curtis Hawthorne]

Files:

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

trunk/actionpack/lib/action_controller/request.rb

@@ -589 +589 @@
-          raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
-
-
+
+
+
+
+
+
+
-          params
-        end

trunk/actionpack/test/controller/request_test.rb

@@ -737 +737 @@
-  end
-
+  uses_mocha "test_no_rewind_stream" do
+    def test_no_rewind_stream
+      # Ensures that parse_multipart_form_parameters works with streams that cannot be rewound
+      file = File.open(File.join(FIXTURE_PATH, 'large_text_file'), 'rb')
+      file.expects(:rewind).raises(Errno::ESPIPE)
+      params = ActionController::AbstractRequest.parse_multipart_form_parameters(file, 'AaB03x', file.stat.size, {})
+      assert_not_equal 0, file.pos  # file was not rewound after reading
+    end
+  end
+
-  def test_binary_file
-    params = process('binary_file')