From 7bcfcde9f9bfed2ecd666869e4adb71ee1861ced Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 19 Jul 2009 17:17:32 -0700 Subject: app/exec_cgi: fix 1.9 compatibility "/dev/null" must be opened in binary mode for Rack-compliance. Additionally, avoid '' to create an empty string and use Unicorn::Z instead. --- lib/unicorn/app/exec_cgi.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/unicorn/app/exec_cgi.rb') diff --git a/lib/unicorn/app/exec_cgi.rb b/lib/unicorn/app/exec_cgi.rb index b0fbedc..861d5e6 100644 --- a/lib/unicorn/app/exec_cgi.rb +++ b/lib/unicorn/app/exec_cgi.rb @@ -121,12 +121,12 @@ module Unicorn::App if inp.respond_to?(:fileno) && Integer === inp.fileno inp elsif inp.size == 0 # inp could be a StringIO or StringIO-like object - ::File.open('/dev/null') + ::File.open('/dev/null', 'rb') else tmp = Unicorn::Util.tmpio # Rack::Lint::InputWrapper doesn't allow sysread :( - buf = '' + buf = Unicorn::Z.dup while inp.read(CHUNK_SIZE, buf) tmp.syswrite(buf) end -- cgit v1.2.3-24-ge0c7