mongrel 0.3.12.3 → 0.3.12.4

data/lib/mongrel.rb

@@ -7,7 +7,7 @@ require 'mongrel/handlers'
 require 'mongrel/command'
 require 'mongrel/tcphack'
 require 'yaml'
-
+require 'time'
 
 # Mongrel module containing all of the classes (include C extensions) for running
 # a Mongrel web server.  It contains a minimalist HTTP server with just enough
@@ -99,7 +99,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.12.3".freeze
+    MONGREL_VERSION="0.3.12.4".freeze
 
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
     ERROR_404_RESPONSE="HTTP/1.1 404 Not Found\r\nConnection: close\r\nServer: #{MONGREL_VERSION}\r\n\r\nNOT FOUND".freeze
@@ -116,9 +116,6 @@ module Mongrel
     # this, but we'd also like to do this as well.
     MAX_HEADER=1024 * (80 + 32)
 
-    # Format to generate a correct RFC 1123 date.  rdoc for Time is wrong, there is no httpdate function.
-    RFC_1123_DATE_FORMAT="%a, %d %B %Y %H:%M:%S GMT".freeze
-
     # A frozen format for this is about 15% faster
     STATUS_FORMAT = "HTTP/1.1 %d %s\r\nContent-Length: %d\r\nConnection: close\r\n".freeze
     CONTENT_TYPE = "Content-Type".freeze
@@ -268,7 +265,7 @@ module Mongrel
       @body = StringIO.new
       @status = 404
       @header = HeaderOut.new(StringIO.new)
-      @header[Const::DATE] = HttpServer.httpdate(Time.now)
+      @header[Const::DATE] = Time.now.httpdate
       @body_sent = false
       @header_sent = false
       @status_sent = false
@@ -573,11 +570,6 @@ module Mongrel
       stopper.priority = 10
     end
 
-    # Given the a time object it converts it to GMT and applies the RFC1123 format to it.
-    def HttpServer.httpdate(date)
-      date.gmtime.strftime(Const::RFC_1123_DATE_FORMAT)
-    end
-
   end
 
 

data/lib/mongrel/debug.rb

@@ -129,7 +129,7 @@ module RequestLog
     
     def process(request,response)
       p = request.params
-      STDERR.puts "#{p['REMOTE_ADDR']} - [#{Mongrel::HttpServer.httpdate(Time.now)}] \"#{p['REQUEST_METHOD']} #{p["REQUEST_URI"]} HTTP/1.1\""
+      STDERR.puts "#{p['REMOTE_ADDR']} - [#{Time.now.httpdate}] \"#{p['REQUEST_METHOD']} #{p["REQUEST_URI"]} HTTP/1.1\""
     end
   end
   

data/lib/mongrel/handlers.rb

@@ -70,7 +70,15 @@ module Mongrel
   # converting all paths to an absolute expanded path, and then making sure
   # that the final expanded path includes the root path.  If it doesn't
   # than it simply gives a 404.
+  #
+  # The default content type is "text/plain; charset=ISO-8859-1" but you
+  # can change it anything you want using the DirHandler.default_content_type
+  # attribute.
   class DirHandler < HttpHandler
+    attr_reader :default_content_type
+    attr_writer :default_content_type
+    attr_reader :path
+
     MIME_TYPES = {
       ".css"        =>  "text/css",
       ".gif"        =>  "image/gif",
@@ -86,13 +94,12 @@ module Mongrel
 
     ONLY_HEAD_GET="Only HEAD and GET allowed.".freeze
 
-    attr_reader :path
-
     # You give it the path to the directory root and an (optional) 
     def initialize(path, listing_allowed=true, index_html="index.html")
       @path = File.expand_path(path)
       @listing_allowed=listing_allowed
       @index_html = index_html
+      @default_content_type = "text/plain; charset=ISO-8859-1".freeze
     end
 
     # Checks if the given path can be served and returns the full path (or nil if not).
@@ -162,22 +169,22 @@ module Mongrel
 
       # first we setup the headers and status then we do a very fast send on the socket directly
       response.status = 200
+      stat = File.stat(req)
+      header = response.header
+
+      # Set the last modified times as well and etag for all files
+      header[Const::LAST_MODIFIED] = stat.mtime.httpdate
+      # Calculated the same as apache, not sure how well the works on win32
+      header[Const::ETAG] = Const::ETAG_FORMAT % [stat.mtime.to_i, stat.size, stat.ino]
       
       # set the mime type from our map based on the ending
-      dot_at = req.rindex(".")
+      dot_at = req.rindex(".")      
       if dot_at
-        ext = req[dot_at .. -1]
-        if MIME_TYPES[ext]
-          stat = File.stat(req)
-          response.header[Const::CONTENT_TYPE] = MIME_TYPES[ext] || "text"
-          # TODO: Confirm this works for rfc 1123
-          response.header[Const::LAST_MODIFIED] = HttpServer.httpdate(stat.mtime)
-          # TODO that this is a valid way to calculate an etag
-          response.header[Const::ETAG] = Const::ETAG_FORMAT % [stat.mtime.to_i, stat.size, stat.ino]
-        end
+        header[Const::CONTENT_TYPE] = MIME_TYPES[req[dot_at .. -1]] || @default_content_type
       end
 
-      response.send_status(File.size(req))
+      # send a status with out content length
+      response.send_status(stat.size)
       response.send_header
 
       if not header_only
@@ -187,8 +194,9 @@ module Mongrel
 	  else
 	    File.open(req, "rb") { |f| response.socket.write(f.read) }
 	  end
-        rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL
+        rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF
 	  # ignore these since it means the client closed off early
+          STDERR.puts "Client closed socket requesting file #{req}: #$!"
 	end
       else
         response.send_body # should send nothing

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 0.3.12.3
-date: 2006-04-06 00:00:00 -04:00
+  version: 0.3.12.4
+date: 2006-04-10 00:00:00 -04:00
 summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
 require_paths: 
 - lib