From 0fb0096ffd3e07d9da2bb35954d5d6c9a4e27cce Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Thu, 16 Dec 2004 09:46:00 +0000 Subject: * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait for reading request till data arrive. [ruby-talk:121068] * lib/webrick/server.rb (WEBrick::GenericServer#start_thread): should log about all accepted socket. [ruby-core:03962] * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params): "%%" and "%u" are supported. [webricken:135] * lib/webrick/httpservlet/filehandler.rb (WEBrick::HTTPServlet::FileHandler#check_filename): :NondisclosureName is acceptable if it is Enumerable. * lib/webrick/config.rb (WEBrick::Config::FileHandler): default value of :NondisclosureName is [".ht*", "*~"]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/server.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/webrick/server.rb') diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 93e3b2ccf..bc0ad97c8 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -144,8 +144,13 @@ module WEBrick Thread.start{ begin Thread.current[:WEBrickSocket] = sock - addr = sock.peeraddr - @logger.debug "accept: #{addr[3]}:#{addr[1]}" + begin + addr = sock.peeraddr + @logger.debug "accept: #{addr[3]}:#{addr[1]}" + rescue SocketError + @logger.debug "accept:
" + raise + end call_callback(:AcceptCallback, sock) block ? block.call(sock) : run(sock) rescue Errno::ENOTCONN -- cgit