Eric Wong <[email protected]> wrote: > Andrew Hobson <[email protected]> wrote: > > I applied that one line patch a day and a half ago and we haven't seen > > the error in the field (yet). I am optimistic you have elegantly fixed > > the problem. > > > > If we do see an error, I will send another email to the list. > > > > Thanks again for your help, > > No problem, I'll push that out later today.
Pushed, thanks again: >From f4005d5efc608e7d75371f0d0527041facd33f89 Mon Sep 17 00:00:00 2001 From: Eric Wong <[email protected]> Date: Thu, 7 Nov 2013 20:10:01 +0000 Subject: [PATCH] stream_input: avoid IO#close on client disconnect This can avoid IOError from being seen by the application, and also reduces points where IO#close may be called. This is a good thing if we eventually port this code into a low-level server like cmogstored where per-client memory space is defined by FD number of a client. Reported-by: Andrew Hobson <[email protected]> --- lib/unicorn/stream_input.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/unicorn/stream_input.rb b/lib/unicorn/stream_input.rb index c8a4240..9278f47 100644 --- a/lib/unicorn/stream_input.rb +++ b/lib/unicorn/stream_input.rb @@ -139,10 +139,7 @@ private # we do support clients that shutdown(SHUT_WR) after the # _entire_ request has been sent, and those will not have # raised EOFError on us. - if @socket - @socket.shutdown - @socket.close - end + @socket.shutdown if @socket ensure raise Unicorn::ClientShutdown, "bytes_read=#{@bytes_read}", [] end -- 1.8.4.483.g7fe67e6.dirty _______________________________________________ Unicorn mailing list - [email protected] http://rubyforge.org/mailman/listinfo/mongrel-unicorn Do not quote signatures (like this one) or top post when replying
