*** empty log message ***

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

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 87a33ffaa1..46575734c1 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -61,6 +61,9 @@ module WEBrick
           warn(":Listen option is deprecated; use GenericServer#listen")
         end
         listen(@config[:BindAddress], @config[:Port])
+        if @config[:Port] == 0
+          @config[:Port] = @listeners[0].addr[1]
+        end
       end
     end
 
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