0
@@ -588,7 +588,13 @@
0
           end
0
           raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
0
 
0
-          body.rewind if body.respond_to?(:rewind)
0
+	  begin
0
+            body.rewind if body.respond_to?(:rewind)
0
+	  rescue Errno::ESPIPE
0
+            # Handles exceptions raised by input streams that cannot be rewound
0
+            # such as when using plain CGI under Apache
0
+	  end
0
+
0
           params
0
         end
0
     end

0
@@ -736,6 +736,16 @@
0
     assert ('a' * 20480) == file.read
0
   end
0
 
0
+  uses_mocha "test_no_rewind_stream" do
0
+    def test_no_rewind_stream
0
+      # Ensures that parse_multipart_form_parameters works with streams that cannot be rewound
0
+      file = File.open(File.join(FIXTURE_PATH, 'large_text_file'), 'rb')
0
+      file.expects(:rewind).raises(Errno::ESPIPE)
0
+      params = ActionController::AbstractRequest.parse_multipart_form_parameters(file, 'AaB03x', file.stat.size, {})
0
+      assert_not_equal 0, file.pos  # file was not rewound after reading
0
+    end
0
+  end
0
+
0
   def test_binary_file
0
     params = process('binary_file')
0
     assert_equal %w(file flowers foo), params.keys.sort