From 48dde6f3e6b3faf336a8734a21a7124115ed500f Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 21 Mar 2004 13:17:24 +0000 Subject: * lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): sort @virtual_hosts in address, port, host order. * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server): hostname should not be match if :ServerAlias is not given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/httpserver.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/webrick/httpserver.rb') diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb index 849706eb46..13574e7de0 100644 --- a/lib/webrick/httpserver.rb +++ b/lib/webrick/httpserver.rb @@ -132,14 +132,21 @@ module WEBrick def virtual_host(server) @virtual_hosts << server + @virtual_hosts = @virtual_hosts.sort_by{|s| + num = 0 + num -= 4 if s[:BindAddress] + num -= 2 if s[:Port] + num -= 1 if s[:ServerName] + num + } end def lookup_server(req) @virtual_hosts.find{|s| - (s[:Port].nil? || req.port == s[:Port]) && (s[:BindAddress].nil? || req.addr[3] == s[:BindAddress]) && + (s[:Port].nil? || req.port == s[:Port]) && ((s[:ServerName].nil? || req.host == s[:ServerName]) || - (s[:ServerAlias].nil? || s[:ServerAlias].find{|h| h === req.host})) + (!s[:ServerAlias].nil? && s[:ServerAlias].find{|h| h === req.host})) } end -- cgit v1.2.3