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

6 files changed, 57 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d6b2888f2..157e73397c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* 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*", "*~"].
+
 Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (ossl_raise): refine message format.
@@ -48,24 +66,6 @@ Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
 	* ext/curses/curses.c (window_subwin): call NUM2INT() before
 	GetWINDOW(). (backported from CVS HEAD)
 
-Wed Dec 15 18:00:59 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* 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*", "*~"].
-
 Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
index 25dcbc1be8..f97769545e 100644
--- a/lib/webrick/accesslog.rb
+++ b/lib/webrick/accesslog.rb
@@ -32,6 +32,7 @@ module WEBrick
       params["i"] = req
       params["l"] = "-"
       params["m"] = req.request_method
+      params["n"] = req.attributes
       params["o"] = res
       params["p"] = req.port
       params["q"] = req.query_string
@@ -46,15 +47,17 @@ module WEBrick
     end
 
     def format(format_string, params)
-      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z])/){
+      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z%])/){
          param, spec = $1, $2
          case spec[0]
-         when ?e, ?i, ?o
+         when ?e, ?i, ?n, ?o
            raise AccessLogError,
              "parameter is required for \"#{spec}\"" unless param
            params[spec][param] || "-"
          when ?t
            params[spec].strftime(param || CLF_TIME_FORMAT)
+         when ?%
+           "%"
          else
            params[spec]
          end
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 99691eadbc..36442e6395 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -65,7 +65,7 @@ module WEBrick
     )
 
     FileHandler = {
-      :NondisclosureName => ".ht*",
+      :NondisclosureName => [".ht*", "*~"],
       :FancyIndexing     => false,
       :HandlerTable      => {},
       :HandlerCallback   => nil,
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index ffbae70409..06d2ea1b6c 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -46,6 +46,13 @@ module WEBrick
         req = HTTPRequest.new(@config)
         server = self
         begin
+          timeout = @config[:RequestTimeout]
+          while timeout > 0
+            break if IO.select([sock], nil, nil, 0.5)
+            timeout = 0 if @status != :Running
+            timeout -= 0.5
+          end
+          raise HTTPStatus::EOFError if timeout <= 0
           req.parse(sock)
           res.request_method = req.request_method
           res.request_uri = req.request_uri
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 1c48734987..ba9417f3e8 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -226,7 +226,7 @@ module WEBrick
 
         path_info.unshift("")  # dummy for checking @root dir
         while base = path_info.first
-          check_filename(base)
+          check_filename(req, res, base)
           break if base == "/"
           break unless File.directory?(res.filename + base)
           shift_path_info(req, res, path_info)
@@ -234,7 +234,7 @@ module WEBrick
         end
 
         if base = path_info.first
-          check_filename(base)
+          check_filename(req, res, base)
           if base == "/"
             if file = search_index_file(req, res)
               shift_path_info(req, res, path_info, file)
@@ -254,11 +254,13 @@ module WEBrick
         return false
       end
 
-      def check_filename(name)
-        if File.fnmatch("/#{@options[:NondisclosureName]}", name)
-          @logger.warn("the request refers nondisclosure name `#{name}'.")
-          raise HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
+      def check_filename(req, res, name)
+        @options[:NondisclosureName].each{|pattern|
+          if File.fnmatch("/#{pattern}", name)
+            @logger.warn("the request refers nondisclosure name `#{name}'.")
+            raise HTTPStatus::NotFound, "`#{req.path}' not found."
+          end
+        }
       end
 
       def shift_path_info(req, res, path_info, base=nil)
@@ -306,6 +308,15 @@ module WEBrick
         end
       end
 
+      def nondisclosure_name?(name)
+        @options[:NondisclosureName].each{|pattern|
+          if File.fnmatch(pattern, name)
+            return true
+          end
+        }
+        return false
+      end
+
       def set_dir_list(req, res)
         redirect_to_directory_uri(req, res)
         unless @options[:FancyIndexing]
@@ -314,7 +325,7 @@ module WEBrick
         local_path = res.filename
         list = Dir::entries(local_path).collect{|name|
           next if name == "." || name == ".."
-          next if File::fnmatch(@options[:NondisclosureName], name)
+          next if nondisclosure_name?(name)
           st = (File::stat(local_path + name) rescue nil)
           if st.nil?
             [ name, nil, -1 ]
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 93e3b2ccf5..bc0ad97c88 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: <address unknown>"
+            raise
+          end
           call_callback(:AcceptCallback, sock)
           block ? block.call(sock) : run(sock)
         rescue Errno::ENOTCONN