* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@7566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 0668e27b05..48d9fcd4ec 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -147,8 +147,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: <address unknown>"
+            raise
+          end
           call_callback(:AcceptCallback, sock)
           block ? block.call(sock) : run(sock)
         rescue Errno::ENOTCONN