From f80a4dcd470f0e69743c96f2c0559cf03abce2e9 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Wed, 23 Mar 2005 19:08:03 +0000 Subject: * lib/webrick/utils.rb (WEBrick::Utils.create_listeners): - should raise ArgumentError if no port is specified. - even if the specified port is 0, all TCPServers should be initialized with the port given to the first one. * lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port parameter is 0, it should be updated with the port number which ectually listened. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/utils.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/webrick/utils.rb') diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index 41b54271c7..7283704c1d 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -49,6 +49,9 @@ module WEBrick module_function :getservername def create_listeners(address, port, logger=nil) + unless port + raise ArgumentError, "must specify port" + end res = Socket::getaddrinfo(address, port, Socket::AF_UNSPEC, # address family Socket::SOCK_STREAM, # socket type @@ -58,8 +61,9 @@ module WEBrick sockets = [] res.each{|ai| begin - logger.debug("TCPServer.new(#{ai[3]}, #{ai[1]})") if logger - sock = TCPServer.new(ai[3], ai[1]) + logger.debug("TCPServer.new(#{ai[3]}, #{port})") if logger + sock = TCPServer.new(ai[3], port) + port = sock.addr[1] if port == 0 Utils::set_close_on_exec(sock) sockets << sock rescue => ex -- cgit v1.2.3