mongrel 0.3.13.1 → 0.3.13.2

data/ext/http11/http11.c

@@ -1,4 +1,4 @@
-/* Mongrel Web Server - A Mostly Ruby Webserver and Library
+/* Mongrel Web Server - A Mostly Ruby HTTP server and Library
  *
  * Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
  *
@@ -554,7 +554,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.13.1");
+  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.13.2");
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

data/ext/http11/http11_parser.c

@@ -1,5 +1,5 @@
 #line 1 "ext/http11/http11_parser.rl"
-/* Mongrel Web Server - A Mostly Ruby Webserver and Library
+/* Mongrel Web Server - A Mostly Ruby HTTP server and Library
  *
  * Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
  *

data/ext/http11/http11_parser.h

@@ -1,4 +1,4 @@
-/* Mongrel Web Server - A Mostly Ruby Webserver and Library
+/* Mongrel Web Server - A Mostly Ruby HTTP server and Library
  *
  * Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
  *

data/lib/mongrel.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #
@@ -28,8 +28,7 @@ require 'mongrel/tcphack'
 require 'yaml'
 require 'time'
 require 'rubygems'
-require 'etc' 
-
+require 'etc'
 
 begin
   require 'sendfile'
@@ -62,8 +61,10 @@ module Mongrel
 
 
   # Used to stop the HttpServer via Thread.raise.
-  class StopServer < Exception
-  end
+  class StopServer < Exception; end
+
+  # Thrown at a thread when it is timed out.
+  class TimeoutError < Exception; end
 
 
   # Every standard HTTP code mapped to the appropriate message.  These are
@@ -131,7 +132,7 @@ module Mongrel
     # The original URI requested by the client.  Passed to URIClassifier to build PATH_INFO and SCRIPT_NAME.
     REQUEST_URI='REQUEST_URI'.freeze
 
-    MONGREL_VERSION="0.3.13.1".freeze
+    MONGREL_VERSION="0.3.13.2".freeze
 
     # TODO: this use of a base for tempfiles needs to be looked at for security problems
     MONGREL_TMP_BASE="mongrel".freeze
@@ -183,7 +184,12 @@ module Mongrel
   #
   # The HttpRequest.initialize method will convert any request that is larger than
   # Const::MAX_BODY into a Tempfile and use that as the body.  Otherwise it uses 
-  # a StringIO object.  To be safe, you should assume it works like a file.  
+  # a StringIO object.  To be safe, you should assume it works like a file.
+  #
+  # The HttpHandler.request_notify system is implemented by having HttpRequest call
+  # HttpHandler.request_begins, HttpHandler.request_progress, HttpHandler.process during
+  # the IO processing.  This adds a small amount of overhead but lets you implement
+  # finer controlled handlers and filters.
   class HttpRequest
     attr_reader :body, :params
 
@@ -192,11 +198,12 @@ module Mongrel
     # body data into the HttpRequest.body attribute.
     #
     # TODO: Implement tempfile removal when the request is done.
-    def initialize(params, initial_body, socket)
+    def initialize(params, initial_body, socket, notifier)
       @params = params
       @socket = socket
 
       clen = params[Const::CONTENT_LENGTH].to_i - initial_body.length
+      total = clen
 
       if clen > Const::MAX_BODY
         @body = Tempfile.new(Const::MONGREL_TMP_BASE)
@@ -207,24 +214,27 @@ module Mongrel
 
       begin
         @body.write(initial_body)
+        notifier.request_begins(params) if notifier
 
         # write the odd sized chunk first
         clen -= @body.write(@socket.read(clen % Const::CHUNK_SIZE))
+        notifier.request_progress(params, clen, total) if notifier
 
         # then stream out nothing but perfectly sized chunks
-        while clen > 0
+        while clen > 0 and !@socket.closed?
           data = @socket.read(Const::CHUNK_SIZE)
           # have to do it this way since @socket.eof? causes it to block
           raise "Socket closed or read failure" if not data or data.length != Const::CHUNK_SIZE
           clen -= @body.write(data)
           # ASSUME: we are writing to a disk and these writes always write the requested amount
+          notifier.request_progress(params, clen, total) if notifier
         end
 
         # rewind to keep the world happy
         @body.rewind
       rescue Object
         # any errors means we should delete the file, including if the file is dumped
-        STDERR.puts "Error reading request: #$!"
+        @socket.close unless @socket.closed?
         @body.delete if @body.class == Tempfile
         @body = nil # signals that there was a problem
       end
@@ -454,7 +464,7 @@ module Mongrel
 
   end
 
-  # This is the main driver of Mongrel, while the Mognrel::HttpParser and Mongrel::URIClassifier
+  # This is the main driver of Mongrel, while the Mongrel::HttpParser and Mongrel::URIClassifier
   # make up the majority of how the server functions.  It's a very simple class that just
   # has a thread accepting connections and a simple HttpServer.process_client function
   # to do the heavy lifting with the IO and Ruby.  
@@ -517,7 +527,7 @@ module Mongrel
       begin
         parser = HttpParser.new
         params = {}
-
+        request = nil
         data = client.readpartial(Const::CHUNK_SIZE)
         nparsed = 0
 
@@ -535,15 +545,12 @@ module Mongrel
               params[Const::PATH_INFO] = path_info
               params[Const::SCRIPT_NAME] = script_name
               params[Const::REMOTE_ADDR] = params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last
-              data = data[nparsed ... data.length] || ""
-
-              if handlers[0].request_notify
-                # this first handler wants to be notified when the process starts
-                handlers[0].request_begins(params)
-              end
+              notifier = handlers[0].request_notify ? handlers[0] : nil
 
               # TODO: Find a faster/better way to carve out the range, preferably without copying.
-              request = HttpRequest.new(params, data, client)
+              data = data[nparsed ... data.length] || ""
+
+              request = HttpRequest.new(params, data, client, notifier)
 
               # in the case of large file uploads the user could close the socket, so skip those requests
               break if request.body == nil  # nil signals from HttpRequest::initialize that the request was aborted
@@ -563,7 +570,6 @@ module Mongrel
               end
             else
               # Didn't find it, return a stock 404 response.
-              # TODO: Implement customer 404 files (but really they should use a real web server).
               client.write(Const::ERROR_404_RESPONSE)
             end
 
@@ -580,27 +586,46 @@ module Mongrel
         # ignored
       rescue HttpParserError
         STDERR.puts "#{Time.now}: BAD CLIENT (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!"
-      rescue => details
+      rescue Errno::EMFILE
+        reap_dead_workers('too many files')
+      rescue Object
         STDERR.puts "#{Time.now}: ERROR: #$!"
-        STDERR.puts details.backtrace.join("\n")
       ensure
         client.close unless client.closed?
+        request.body.delete if request and request.body.class == Tempfile
       end
     end
 
     # Used internally to kill off any worker threads that have taken too long
     # to complete processing.  Only called if there are too many processors
-    # currently servicing.
-    def reap_dead_workers(worker_list)
-      mark = Time.now
-      worker_list.each do |w|
-        w[:started_on] = Time.now if not w[:started_on]
-
-        if mark - w[:started_on] > @death_time + @timeout
-          STDERR.puts "Thread #{w.inspect} is too old, killing."
-          w.raise(StopServer.new("Timed out thread."))
+    # currently servicing.  It returns the count of workers still active
+    # after the reap is done.  It only runs if there are workers to reap.
+    def reap_dead_workers(reason='unknown')
+      if @workers.list.length > 0
+        STDERR.puts "#{Time.now}: Reaping #{@workers.list.length} threads for slow workers because of '#{reason}'"
+        mark = Time.now
+        @workers.list.each do |w|
+          w[:started_on] = Time.now if not w[:started_on]
+
+          if mark - w[:started_on] > @death_time + @timeout
+            STDERR.puts "Thread #{w.inspect} is too old, killing."
+            w.raise(TimeoutError.new("Timed out thread."))
+          end
         end
       end
+
+      return @workers.list.length
+    end
+
+    # Performs a wait on all the currently running threads and kills any that take
+    # too long.  Right now it just waits 60 seconds, but will expand this to
+    # allow setting.  The @timeout setting does extend this waiting period by
+    # that much longer.
+    def graceful_shutdown
+      while reap_dead_workers("shutdown") > 0
+        STDERR.print "Waiting for #{@workers.list.length} requests to finish, could take #{@death_time + @timeout} seconds."
+        sleep @death_time / 10
+      end
     end
 
 
@@ -618,14 +643,12 @@ module Mongrel
             if worker_list.length >= @num_processors
               STDERR.puts "Server overloaded with #{worker_list.length} processors (#@num_processors max). Dropping connection."
               client.close
-              reap_dead_workers(worker_list)
+              reap_dead_workers("max processors")
             else
-              thread = Thread.new do
-                process_client(client)
-              end
+              thread = Thread.new { process_client(client) }
 
+              thread.abort_on_exception = true
               thread[:started_on] = Time.now
-              thread.priority=1
               @workers.add(thread)
 
               sleep @timeout/100 if @timeout > 0
@@ -634,22 +657,12 @@ module Mongrel
             @socket.close if not @socket.closed?
             break
           rescue Errno::EMFILE
-            STDERR.puts "Too many open files.  Try increasing ulimits."
+            reap_dead_workers("too many open files")
             sleep 0.5
           end
         end
 
-        # troll through the threads that are waiting and kill any that take too long
-        # TODO: Allow for death time to be set if people ask for it.
-        @death_time = 10
-        shutdown_start = Time.now
-
-        while @workers.list.length > 0
-          waited_for = (Time.now - shutdown_start).ceil
-          STDERR.print "Shutdown waited #{waited_for} for #{@workers.list.length} requests, could take #{@death_time + @timeout} seconds.\r" if @workers.list.length > 0
-          sleep 1
-          reap_dead_workers(@workers.list)
-        end
+        graceful_shutdown
       end
 
       return @acceptor
@@ -746,8 +759,6 @@ module Mongrel
       @needs_restart = false
       @pid_file = defaults[:pid_file]
 
-      change_privilege(@defaults[:user], @defaults[:group])
-      
       if blk
         cloaker(&blk).bind(self).call
       end
@@ -812,6 +823,8 @@ module Mongrel
     # * :port => Port to bind.
     # * :num_processors => The maximum number of concurrent threads allowed.  (950 default)
     # * :timeout => 1/100th of a second timeout between requests. (10 is 1/10th, 0 is timeout)
+    # * :user => User to change to, must have :group as well.
+    # * :group => Group to change to, must have :user as well.
     #
     def listener(options={},&blk)
       raise "Cannot call listener inside another listener block." if (@listener or @listener_name)
@@ -823,6 +836,10 @@ module Mongrel
       @listener_name = "#{ops[:host]}:#{ops[:port]}"
       @listeners[@listener_name] = @listener
 
+      if ops[:user] and ops[:group]
+        change_privilege(ops[:user], ops[:group])
+      end
+
       # Does the actual cloaking operation to give the new implicit self.
       if blk
         cloaker(&blk).bind(self).call
@@ -972,7 +989,7 @@ module Mongrel
 
 
     # This method should actually be called *outside* of the
-    # Configurator block so that you can control it.  In otherwords
+    # Configurator block so that you can control it.  In other words
     # do it like:  config.join.
     def join
       @listeners.values.each {|s| s.acceptor.join }
@@ -991,9 +1008,9 @@ module Mongrel
     #   debug "/", what = [:rails]
     # 
     # And it will only produce the log/mongrel_debug/rails.log file.
-    # Available options are:  :object, :railes, :files, :threads, :params
+    # Available options are:  :object, :rails, :files, :threads, :params
     # 
-    # NOTE: Use [:files] to get acccesses dumped to stderr like with WEBrick.
+    # NOTE: Use [:files] to get accesses dumped to stderr like with WEBrick.
     def debug(location, what = [:object, :rails, :files, :threads, :params])
       require 'mongrel/debug'
       handlers = {

data/lib/mongrel/camping.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/cgi.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/command.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/debug.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/handlers.rb

@@ -1,7 +1,7 @@
 require 'mongrel/stats'
 require 'zlib'
 
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #
@@ -41,6 +41,12 @@ module Mongrel
     def request_begins(params)
     end
 
+    # Called by Mongrel for each IO chunk that is received on the request socket
+    # from the client, allowing you to track the progress of the IO and monitor
+    # the input.
+    def request_progress(params, clen, total)
+    end
+
     def process(request, response)
     end
 
@@ -59,6 +65,9 @@ module Mongrel
     def request_begins(params)
     end
 
+    def request_progress(params, clen, total)
+    end
+
     def initialize(options={})
       @options = options
       @header_only = false

data/lib/mongrel/init.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/rails.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/stats.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/lib/mongrel/tcphack.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_command.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_conditional.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_configurator.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_debug.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_handlers.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_http11.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #

data/test/test_response.rb

@@ -1,4 +1,4 @@
-# Mongrel Web Server - A Mostly Ruby Webserver and Library
+# Mongrel Web Server - A Mostly Ruby HTTP server and Library
 #
 # Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
 #