* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port

  instead of config[:Port] or req.request_uri.port.

* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.

* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.

* lib/webrick/config.rb: :Listen option never be used.

* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
  option and add warning message.

* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).

* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index c71b118642..77519bf8e5 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -56,11 +56,11 @@ module WEBrick
       @logger.info("ruby #{rubyv}")
 
       @listeners = []
-      unless  @config[:DoNotListen]
+      unless @config[:DoNotListen]
+        if @config[:Listen]
+          warn(":Listen option is deprecated; use GenericServer#listen")
+        end
         listen(@config[:BindAddress], @config[:Port])
-        @config[:Listen].each{|addr, port|
-          listen(addr, port).each{|sock| @listeners << sock }
-        }
       end
     end