1 files changed, 60 insertions, 6 deletions

diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 9edb0018f8..ddf1ac7404 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -19,9 +19,30 @@ require 'webrick/accesslog'
 module WEBrick
   class HTTPServerError < ServerError; end
 
+  ##
+  # An HTTP Server
+
   class HTTPServer < ::WEBrick::GenericServer
+    ##
+    # Creates a new HTTP server according to +config+
+    #
+    # An HTTP server uses the following attributes:
+    #
+    # :AccessLog:: An array of access logs.  See WEBrick::AccessLog
+    # :BindAddress:: Local address for the server to bind to
+    # :DocumentRoot:: Root path to serve files from
+    # :DocumentRootOptions:: Options for the default HTTPServlet::FileHandler
+    # :HTTPVersion:: The HTTP version of this server
+    # :Port:: Port to listen on
+    # :RequestCallback:: Called with a request and response before each
+    #                    request is serviced.
+    # :RequestTimeout:: Maximum time to wait between requests
+    # :ServerAlias:: Array of alternate names for this server for virtual
+    #                hosting
+    # :ServerName:: Name for this server for virtual hosting
+
     def initialize(config={}, default=Config::HTTP)
-      super
+      super(config, default)
       @http_version = HTTPVersion::convert(@config[:HTTPVersion])
 
       @mount_tab = MountTable.new
@@ -36,12 +57,15 @@ module WEBrick
           [ $stderr, AccessLog::REFERER_LOG_FORMAT ]
         ]
       end
- 
+
       @virtual_hosts = Array.new
     end
 
+    ##
+    # Processes requests on +sock+
+
     def run(sock)
-      while true 
+      while true
         res = HTTPResponse.new(@config)
         req = HTTPRequest.new(@config)
         server = self
@@ -52,14 +76,19 @@ module WEBrick
             timeout = 0 if @status != :Running
             timeout -= 0.5
           end
-          raise HTTPStatus::EOFError if timeout <= 0 || sock.eof?
+          raise HTTPStatus::EOFError if timeout <= 0
+          raise HTTPStatus::EOFError if sock.eof?
           req.parse(sock)
           res.request_method = req.request_method
           res.request_uri = req.request_uri
           res.request_http_version = req.http_version
           res.keep_alive = req.keep_alive?
           server = lookup_server(req) || self
-          if callback = server[:RequestCallback] || server[:RequestHandler]
+          if callback = server[:RequestCallback]
+            callback.call(req, res)
+          elsif callback = server[:RequestHandler]
+            msg = ":RequestHandler is deprecated, please use :RequestCallback"
+            @logger.warn(msg)
             callback.call(req, res)
           end
           server.service(req, res)
@@ -75,7 +104,9 @@ module WEBrick
           res.set_error(ex, true)
         ensure
           if req.request_line
-            req.fixup()
+            if req.keep_alive? && res.keep_alive?
+              req.fixup()
+            end
             res.send_response(sock)
             server.access_log(@config, req, res)
           end
@@ -86,6 +117,9 @@ module WEBrick
       end
     end
 
+    ##
+    # Services +req+ and fills in +res+
+
     def service(req, res)
       if req.unparsed_uri == "*"
         if req.request_method == "OPTIONS"
@@ -108,23 +142,37 @@ module WEBrick
       res["allow"] = "GET,HEAD,POST,OPTIONS"
     end
 
+    ##
+    # Mounts +servlet+ on +dir+ passing +options+ to the servlet at creation
+    # time
+
     def mount(dir, servlet, *options)
       @logger.debug(sprintf("%s is mounted on %s.", servlet.inspect, dir))
       @mount_tab[dir] = [ servlet, options ]
     end
 
+    ##
+    # Mounts +proc+ or +block+ on +dir+ and calls it with a
+    # WEBrick::HTTPRequest and WEBrick::HTTPResponse
+
     def mount_proc(dir, proc=nil, &block)
       proc ||= block
       raise HTTPServerError, "must pass a proc or block" unless proc
       mount(dir, HTTPServlet::ProcHandler.new(proc))
     end
 
+    ##
+    # Unmounts +dir+
+
     def unmount(dir)
       @logger.debug(sprintf("unmount %s.", dir))
       @mount_tab.delete(dir)
     end
     alias umount unmount
 
+    ##
+    # Finds a servlet for +path+
+
     def search_servlet(path)
       script_name, path_info = @mount_tab.scan(path)
       servlet, options = @mount_tab[script_name]
@@ -133,6 +181,9 @@ module WEBrick
       end
     end
 
+    ##
+    # Adds +server+ as a virtual host.
+
     def virtual_host(server)
       @virtual_hosts << server
       @virtual_hosts = @virtual_hosts.sort_by{|s|
@@ -144,6 +195,9 @@ module WEBrick
       }
     end
 
+    ##
+    # Finds the appropriate virtual host to handle +req+
+
     def lookup_server(req)
       @virtual_hosts.find{|s|
         (s[:BindAddress].nil? || req.addr[3] == s[:BindAddress]) &&