2 files changed, 19 insertions, 7 deletions
diff --git a/lib/unicorn/app/exec_cgi.rb b/lib/unicorn/app/exec_cgi.rb
index 8f81d78..b0fbedc 100644
--- a/lib/unicorn/app/exec_cgi.rb
+++ b/lib/unicorn/app/exec_cgi.rb
@@ -42,11 +42,8 @@ module Unicorn::App
  
      # Calls the app
      def call(env)
-      out, err = Tempfile.new(''), Tempfile.new('')
-      out.unlink
-      err.unlink
+      out, err = Unicorn::Util.tmpio, Unicorn::Util.tmpio
        inp = force_file_input(env)
-      inp.sync = out.sync = err.sync = true
        pid = fork { run_child(inp, out, err, env) }
        inp.close
        pid, status = Process.waitpid2(pid)
@@ -126,9 +123,7 @@ module Unicorn::App
        elsif inp.size == 0 # inp could be a StringIO or StringIO-like object
          ::File.open('/dev/null')
        else
-        tmp = Tempfile.new('')
-        tmp.unlink
-        tmp.binmode
+        tmp = Unicorn::Util.tmpio
  
          # Rack::Lint::InputWrapper doesn't allow sysread :(
          buf = ''
diff --git a/lib/unicorn/util.rb b/lib/unicorn/util.rb
index 2d3f827..d2214b7 100644
--- a/lib/unicorn/util.rb
+++ b/lib/unicorn/util.rb
@@ -1,4 +1,5 @@
  require 'fcntl'
+require 'tmpdir'
  
  module Unicorn
    class Util
@@ -39,6 +40,22 @@ module Unicorn
          nr
        end
  
+      # creates and returns a new File object.  The File is unlinked
+      # immediately, switched to binary mode, and userspace output
+      # buffering is disabled
+      def tmpio
+        fp = begin
+          File.open("#{Dir::tmpdir}/#{rand}",
+                    File::RDWR|File::CREAT|File::EXCL, 0600)
+        rescue Errno::EEXIST
+          retry
+        end
+        File.unlink(fp.path)
+        fp.binmode
+        fp.sync = true
+        fp
+      end
+
      end
  
    end