diff options
author | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2008-05-24 23:06:53 +0000 |
---|---|---|
committer | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2008-05-24 23:06:53 +0000 |
commit | 45ff7b22b67123dd8345f3c50151e89cc91ce2b7 (patch) | |
tree | e85c8aa353e3e9f05e90ee8bf76a6593520e1b01 /lib/mongrel/http_request.rb | |
parent | f69f3602b11dc839bb09f8c783b5ec27c54694fd (diff) | |
parent | fa3f48f65222eb5591ef3dd9c05b6c958d564fa4 (diff) | |
download | unicorn-45ff7b22b67123dd8345f3c50151e89cc91ce2b7.tar.gz |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@1020 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel/http_request.rb')
-rw-r--r-- | lib/mongrel/http_request.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mongrel/http_request.rb b/lib/mongrel/http_request.rb index 3ffff9f..c8d4ce4 100644 --- a/lib/mongrel/http_request.rb +++ b/lib/mongrel/http_request.rb @@ -89,11 +89,11 @@ module Mongrel update_request_progress(remain, total) end rescue Object => e - STDERR.puts "#{Time.now.httpdate}: Error reading HTTP body: #{e.inspect}" + STDERR.puts "#{Time.now}: Error reading HTTP body: #{e.inspect}" STDERR.puts e.backtrace.join("\n") # any errors means we should delete the file, including if the file is dumped @socket.close rescue nil - @body.delete if @body.class == Tempfile + @body.close! if @body.class == Tempfile @body = nil # signals that there was a problem end end @@ -102,14 +102,14 @@ module Mongrel if !@socket.closed? data = @socket.read(len) if !data - raise "#{Time.now.httpdate}: Socket read return nil" + raise "Socket read return nil" elsif data.length != len - raise "#{Time.now.httpdate}: Socket read returned insufficient data: #{data.length}" + raise "Socket read returned insufficient data: #{data.length}" else data end else - raise "#{Time.now.httpdate}: Socket already closed when reading." + raise "Socket already closed when reading." end end |