* lib/webrick/config.rb (WEBrick::Config::HTTP): rename :RequestHander

  to :RequestCallback and add new option :ServerAlias.

* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
  :RequestCallback and warn if :RequestHandler is in server's option.

* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
  error message for WEBrick::HTTPSataus::Error.

* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
  lookup for hostname from :ServerAlias if the req.host is not match
  to :ServerName.

* lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
  use $?.exitstatus and refine log message.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 31c0053363..11e1966f13 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -45,14 +45,14 @@ module WEBrick
       :DirectoryIndex => ["index.html","index.htm","index.cgi","index.rhtml"],
       :DocumentRoot   => nil,
       :DocumentRootOptions => { :FancyIndexing => true },
+      :RequestCallback => nil,
+      :ServerAlias    => nil,
 
-      :RequestHandler => nil,
+      # for HTTPProxyServer
       :ProxyAuthProc  => nil,
       :ProxyContentHandler => nil,
       :ProxyVia       => true,
       :ProxyTimeout   => true,
-
-      # upstream proxy server
       :ProxyURI       => nil,
 
       :CGIInterpreter => nil,