2 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index c4a915d1ad..ce8c2729e9 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -17,7 +17,7 @@ module ActionDispatch
       end
 
       # Delegate these methods to the tempfile.
-      [:open, :path, :rewind, :size].each do |method|
+      [:open, :path, :rewind, :size, :eof?].each do |method|
         class_eval "def #{method}; @tempfile.#{method}; end"
       end
 
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 1e3f720fa7..e69c1fbed4 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -65,6 +65,12 @@ module ActionDispatch
       end
     end
 
+    def test_delegate_eof_to_tempfile
+      tf = Class.new { def eof?; true end; }
+      uf = Http::UploadedFile.new(:tempfile => tf.new)
+      assert uf.eof?
+    end
+
     def test_respond_to?
       tf = Class.new { def read; yield end }
       uf = Http::UploadedFile.new(:tempfile => tf.new)