mongrel 0.3.12 → 0.3.12.1

data/lib/mongrel/command.rb

@@ -52,7 +52,7 @@ module Mongrel
         @opt.on_tail("--version", "Show version") do
           @done_validating = true
           if VERSION
-            puts "Version #{VERSION}"
+            puts "Version #{MONGREL_VERSION}"
           end
         end
         

data/lib/mongrel/debug.rb

@@ -43,7 +43,6 @@ end
 
 module ObjectTracker
   @active_objects = nil
-  @live_object_tracking = true
 
   def ObjectTracker.configure
     @active_objects = Set.new
@@ -53,45 +52,32 @@ module ObjectTracker
     end
   end
 
-
-  def ObjectTracker.start
-    @live_object_tracking = true
-  end
-
-  def ObjectTracker.stop
-    @live_object_tracking = false
-  end
-
   def ObjectTracker.sample
-    Class.stopit do
-      ospace = Set.new
-      counts = {}
-      
-      # Strings can't be tracked easily and are so numerous that they drown out all else
-      # so we just ignore them in the counts.
-      ObjectSpace.each_object do |obj|
-        if not obj.kind_of? String
-          ospace << obj.object_id
-          counts[obj.class] ||= 0
-          counts[obj.class] += 1
-        end
-      end
-      
-      dead_objects = @active_objects - ospace
-      new_objects = ospace - @active_objects
-      live_objects = ospace & @active_objects
-      
-      MongrelDbg::trace(:objects, "COUNTS: #{dead_objects.length},#{new_objects.length},#{live_objects.length}")
-      
-      if MongrelDbg::tracing? :objects
-        top_20 = counts.sort{|a,b| b[1] <=> a[1]}[0..20]
-        MongrelDbg::trace(:objects,"TOP 20: #{top_20.inspect}")
-      end
-      
-      @active_objects = live_objects + new_objects
-
-      [@active_objects, top_20]
+    ospace = Set.new
+    counts = {}
+    
+    # Strings can't be tracked easily and are so numerous that they drown out all else
+    # so we just ignore them in the counts.
+    ObjectSpace.each_object do |obj|
+      ospace << obj.object_id
+      counts[obj.class] ||= 0
+      counts[obj.class] += 1
+    end
+    
+    dead_objects = @active_objects - ospace
+    new_objects = ospace - @active_objects
+    live_objects = ospace & @active_objects
+    
+    MongrelDbg::trace(:objects, "COUNTS: #{dead_objects.length},#{new_objects.length},#{live_objects.length}")
+    
+    if MongrelDbg::tracing? :objects
+      top_20 = counts.sort{|a,b| b[1] <=> a[1]}[0..20]
+      MongrelDbg::trace(:objects,"TOP 20: #{top_20.inspect}")
     end
+    
+    @active_objects = live_objects + new_objects
+    
+    [@active_objects, top_20]
   end
 
 end
@@ -123,102 +109,31 @@ module Kernel
   end
 
   def log_open_files
-    Class.stopit do
-      open_counts = {}
-      $open_files.each do |f,args|
-        open_counts[args] ||= 0
-        open_counts[args] += 1
-      end
-      MongrelDbg::trace(:files, open_counts.to_yaml)
+    open_counts = {}
+    $open_files.each do |f,args|
+      open_counts[args] ||= 0
+      open_counts[args] += 1
     end
+    MongrelDbg::trace(:files, open_counts.to_yaml)
   end
 end  
 
 
 
-class Class
-  alias_method :orig_new, :new
-  
-  @@count = 0
-  @@stopit = false
-  @@class_caller_count = Hash.new{|hash,key| hash[key] = Hash.new(0)}
-  
-  def new(*arg,&blk)
-    unless @@stopit
-      @@stopit = true
-      @@count += 1
-      @@class_caller_count[self][caller.join("\n\t")] += 1
-      @@stopit = false
-    end
-    orig_new(*arg,&blk)
-  end
-
-
-  def Class.report_object_creations(out=$stderr, more_than=20)
-    Class.stopit do
-      out.puts "Number of objects created = #{@@count}"
-      
-      total = Hash.new(0)
-      
-      @@class_caller_count.each_key do |klass|
-        caller_count = @@class_caller_count[klass]
-        caller_count.each_value do |count|
-          total[klass] += count
-        end
-      end
-      
-      klass_list = total.keys.sort{|klass_a, klass_b| 
-        a = total[klass_a]
-        b = total[klass_b]
-        if a != b
-          -1* (a <=> b)
-        else
-          klass_a.to_s <=> klass_b.to_s
-        end
-      }
-
-      below_count = 0
-
-      klass_list.each do |klass|
-        below_calls = 0
-        if total[klass] > more_than
-          out.puts "#{total[klass]}\t#{klass} objects created."
-          caller_count = @@class_caller_count[ klass]
-          caller_count.keys.sort_by{|call| -1*caller_count[call]}.each do |call|
-            if caller_count[call] > more_than
-              out.puts "\t** #{caller_count[call]} #{klass} objects AT:"
-              out.puts "\t#{call}\n\n"
-            else
-              below_calls += 1
-            end
-          end
-          out.puts "\t#{below_calls} more objects had calls less that #{more_than} limit.\n\n" if below_calls > 0
-        else
-          below_count += 1
-        end
-      end
-
-      out.puts "\t** #{below_count} More objects were created but the count was below the #{more_than} limit." if below_count > 0
-    end
-  end
+module RequestLog
 
-  def Class.reset_object_creations
-    Class.stopit do
-      @@count = 0
-      @@class_caller_count = Hash.new{|hash,key| hash[key] = Hash.new(0)} 
+  # Just logs whatever requests it gets to STDERR (which ends up in the mongrel
+  # log when daemonized).
+  class Access < GemPlugin::Plugin "/handlers"
+    include Mongrel::HttpHandlerPlugin
+    
+    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\""
     end
   end
+  
 
-  def Class.stopit
-    @@stopit = true
-    yield
-    @@stopit = false
-  end
-
-end
-
-
-module RequestLog
   class Files < GemPlugin::Plugin "/handlers"
     include Mongrel::HttpHandlerPlugin
     
@@ -253,7 +168,6 @@ end
 
 
 END {
-open("log/mongrel_debug/object_tracking.log", "w") {|f| Class.report_object_creations(f) }
 MongrelDbg::trace(:files, "FILES OPEN AT EXIT")
 log_open_files
 }

data/lib/mongrel/handlers.rb

@@ -169,7 +169,7 @@ module Mongrel
         ext = req[dot_at .. -1]
         if MIME_TYPES[ext]
           stat = File.stat(req)
-          response.header[Const::CONTENT_TYPE] = MIME_TYPES[ext]
+          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
@@ -187,7 +187,7 @@ module Mongrel
 	  else
 	    File.open(req, "rb") { |f| response.socket.write(f.read) }
 	  end
-	rescue EOFError,Errno::ECONNRESET,Errno::EPIPE
+        rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL
 	  # ignore these since it means the client closed off early
 	end
       else

data/lib/mongrel/rails.rb

@@ -132,7 +132,8 @@ module Mongrel
         
         $orig_dollar_quote = $".clone
         ENV['RAILS_ENV'] = ops[:environment]
-        require "#{ops[:cwd]}/config/environment"
+        env_location = "#{ops[:cwd]}/config/environment"
+        require env_location
         require 'dispatcher'
         require 'mongrel/rails'
         

data/lib/mongrel/stats.rb

@@ -38,8 +38,8 @@ class Stats
   end
 
   # Dump this Stats object with an optional additional message.
-  def dump(msg = "")
-    STDERR.puts "[#{@name}] #{msg} : SUM=#@sum, SUMSQ=#@sumsq, N=#@n, MEAN=#{mean}, SD=#{sd}, MIN=#@min, MAX=#@max"
+  def dump(msg = "", out=STDERR)
+    out.puts "[#{@name}] #{msg} : SUM=#@sum, SUMSQ=#@sumsq, N=#@n, MEAN=#{mean}, SD=#{sd}, MIN=#@min, MAX=#@max"
   end
 
   # Calculates and returns the mean for the data passed so far.

data/test/test_configurator.rb

@@ -29,12 +29,12 @@ class ConfiguratorTest < Test::Unit::TestCase
         # 2 in front should run, but the sentinel shouldn't since dirhandler processes the request
         uri "/", :handler => plugin("/handlers/testplugin")
         uri "/", :handler => plugin("/handlers/testplugin")
-        uri "/", :handler => Mongrel::DirHandler.new(".", load_mime_map("examples/mime.yaml"))
+        uri "/", :handler => Mongrel::DirHandler.new(".")
         uri "/", :handler => plugin("/handlers/testplugin")
 
         uri "/test", :handler => plugin("/handlers/testplugin")
         uri "/test", :handler => plugin("/handlers/testplugin")
-        uri "/test", :handler => Mongrel::DirHandler.new(".", load_mime_map("examples/mime.yaml"))
+        uri "/test", :handler => Mongrel::DirHandler.new(".")
         uri "/test", :handler => plugin("/handlers/testplugin")
         run
       end

data/test/test_debug.rb

@@ -15,6 +15,8 @@ class MongrelDbgTest < Test::Unit::TestCase
 
 
   def test_tracing_to_log
+    out = StringIO.new
+
     MongrelDbg::begin_trace(:rails)
     MongrelDbg::trace(:rails, "Good stuff")
     MongrelDbg::end_trace(:rails)
@@ -22,10 +24,6 @@ class MongrelDbgTest < Test::Unit::TestCase
     assert File.exist?("log/mongrel_debug"), "Didn't make logging directory"
     assert File.exist?("log/mongrel_debug/rails.log"), "Didn't make the rails.log file"
     assert File.size("log/mongrel_debug/rails.log") > 0, "Didn't write anything to the log."
-
-    Class.report_object_creations
-    Class.reset_object_creations
-    Class.report_object_creations
   end
 
 end

data/test/test_http11.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'http11'
 require 'mongrel'
 require 'benchmark'
+require 'digest/sha1'
 
 include Mongrel
 
@@ -38,17 +39,85 @@ class HttpParserTest < Test::Unit::TestCase
     assert parser.error?, "Parser SHOULD have error"
   end
 
-  def test_query_parse
-    puts HttpRequest.query_parse("zed=1&frank=2").inspect
-    puts HttpRequest.query_parse("zed=1&zed=2&zed=3&frank=11;zed=45").inspect
+  # lame random garbage maker
+  def rand_data(min, max, readable=true)
+    count = min + ((rand(max)+1) *10).to_i
+    res = count.to_s + "/"
+    
+    if readable
+      res << Digest::SHA1.hexdigest(rand(count * 1000).to_s) * (count / 40)
+    else
+      res << Digest::SHA1.digest(rand(count * 1000).to_s) * (count / 20)
+    end
+
+    return res
+  end
+  
+
+  def test_horrible_queries
+    parser = HttpParser.new
+
+    # first verify that large random get requests fail
+    100.times do |c| 
+      get = "GET /#{rand_data(1024, 1024+(c*1024))} HTTP/1.1\r\n"
+      assert_raises Mongrel::HttpParserError do
+        parser.execute({}, get)
+        parser.reset
+      end
+    end
+
+    # then that large header names are caught
+    100.times do |c|
+      get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-#{rand_data(1024, 1024+(c*1024))}: Test\r\n\r\n"
+      assert_raises Mongrel::HttpParserError do
+        parser.execute({}, get)
+        parser.reset
+      end
+    end
 
-    puts Benchmark.measure {
-      10000.times do |i|
-        g = HttpRequest.query_parse("zed=1&zed=2&zed=3&frank=11").inspect
+    # then that large mangled field values are caught
+    100.times do |c|
+      get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
+      assert_raises Mongrel::HttpParserError do
+        parser.execute({}, get)
+        parser.reset
       end
-    }        
+    end
+
+    # then large headers are rejected too
+    get = "GET /#{rand_data(10,120)} HTTP/1.1\r\n"
+    get << "X-Test: test\r\n" * (80 * 1024)
+    assert_raises Mongrel::HttpParserError do
+      parser.execute({}, get)
+      parser.reset
+    end
+
+    # finally just that random garbage gets blocked all the time
+    10.times do |c|
+      get = "GET #{rand_data(1024, 1024+(c*1024), false)} #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
+      assert_raises Mongrel::HttpParserError do
+        parser.execute({}, get)
+        parser.reset
+      end
+    end
+
   end
 
 
+
+  def test_query_parse
+    res = HttpRequest.query_parse("zed=1&frank=2")
+    assert res["zed"], "didn't get the request right"
+    assert res["frank"], "no frank"
+    assert_equal "1", res["zed"], "wrong result"
+    assert_equal "2", res["frank"], "wrong result"
+
+    res = HttpRequest.query_parse("zed=1&zed=2&zed=3&frank=11;zed=45")
+    assert res["zed"], "didn't get the request right"
+    assert res["frank"], "no frank"
+    assert_equal 4,res["zed"].length, "wrong number for zed"
+    assert_equal "11",res["frank"], "wrong number for frank"
+  end
+  
 end
 

data/test/test_stats.rb

@@ -4,13 +4,15 @@ require 'mongrel/stats'
 class StatsTest < Test::Unit::TestCase
 
   def test_sampling_speed
+    out = StringIO.new
+
     s = Stats.new("test")
     t = Stats.new("time")
 
     10000.times { s.sample(rand(20)); t.tick }
 
-    s.dump("FIRST")
-    t.dump("FIRST")
+    s.dump("FIRST", out)
+    t.dump("FIRST", out)
     
     old_mean = s.mean
     old_sd = s.sd
@@ -19,8 +21,8 @@ class StatsTest < Test::Unit::TestCase
     t.reset
     10000.times { s.sample(rand(20)); t.tick }
     
-    s.dump("SECOND")
-    t.dump("SECOND")
+    s.dump("SECOND", out)
+    t.dump("SECOND", out)
     assert_not_equal old_mean, s.mean
     assert_not_equal old_mean, s.sd    
   end

data/test/test_uriclassifier.rb

@@ -91,20 +91,6 @@ class URIClassifierTest < Test::Unit::TestCase
   end
 
 
-  def test_performance
-    count = 8500
-    u = URIClassifier.new
-    u.register("stuff",1)
-
-    res = Benchmark.measure {   count.times { u.resolve("stuff") } }
-    
-    reg_unreg = Benchmark.measure { count.times { u.register("other",1); u.unregister("other"); } }
-
-    puts "\nRESOLVE(#{count}): #{res}"
-    puts "REG_UNREG(#{count}): #{reg_unreg}"
-  end
-
-
   def test_uri_branching
     u = URIClassifier.new
     u.register("/test", 1)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
-date: 2006-03-30 00:00:00 -05:00
+  version: 0.3.12.1
+date: 2006-04-04 00:00:00 -04:00
 summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
 require_paths: 
 - lib
@@ -38,10 +38,6 @@ files:
 - doc/rdoc/classes
 - doc/rdoc/created.rid
 - doc/rdoc/files
-- doc/rdoc/fr_class_index.html
-- doc/rdoc/fr_file_index.html
-- doc/rdoc/fr_method_index.html
-- doc/rdoc/index.html
 - doc/rdoc/rdoc-style.css
 - doc/rdoc/classes/Class.html
 - doc/rdoc/classes/Class.src
@@ -56,7 +52,6 @@ files:
 - doc/rdoc/classes/ObjectTracker.html
 - doc/rdoc/classes/ObjectTracker.src
 - doc/rdoc/classes/RequestLog
-- doc/rdoc/classes/RequestLog.html
 - doc/rdoc/classes/Stats.html
 - doc/rdoc/classes/Stats.src
 - doc/rdoc/classes/TCPServer.html
@@ -72,35 +67,28 @@ files:
 - doc/rdoc/classes/Mongrel/Camping
 - doc/rdoc/classes/Mongrel/Camping.html
 - doc/rdoc/classes/Mongrel/Camping.src
-- doc/rdoc/classes/Mongrel/CGIWrapper.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src
 - doc/rdoc/classes/Mongrel/Command
 - doc/rdoc/classes/Mongrel/Command.html
-- doc/rdoc/classes/Mongrel/Configurator.html
 - doc/rdoc/classes/Mongrel/Configurator.src
 - doc/rdoc/classes/Mongrel/Const.html
 - doc/rdoc/classes/Mongrel/DirHandler.html
 - doc/rdoc/classes/Mongrel/DirHandler.src
-- doc/rdoc/classes/Mongrel/Error404Handler.html
 - doc/rdoc/classes/Mongrel/Error404Handler.src
 - doc/rdoc/classes/Mongrel/HeaderOut.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src
-- doc/rdoc/classes/Mongrel/HttpHandler.html
 - doc/rdoc/classes/Mongrel/HttpHandler.src
 - doc/rdoc/classes/Mongrel/HttpHandlerPlugin.html
 - doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src
 - doc/rdoc/classes/Mongrel/HttpParser.html
 - doc/rdoc/classes/Mongrel/HttpParser.src
-- doc/rdoc/classes/Mongrel/HttpRequest.html
+- doc/rdoc/classes/Mongrel/HttpParserError.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src
-- doc/rdoc/classes/Mongrel/HttpResponse.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src
 - doc/rdoc/classes/Mongrel/HttpServer.html
 - doc/rdoc/classes/Mongrel/HttpServer.src
 - doc/rdoc/classes/Mongrel/Rails
 - doc/rdoc/classes/Mongrel/Rails.html
-- doc/rdoc/classes/Mongrel/StopServer.html
-- doc/rdoc/classes/Mongrel/URIClassifier.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src
 - doc/rdoc/classes/Mongrel/Camping/CampingHandler.html
 - doc/rdoc/classes/Mongrel/Camping/CampingHandler.src
@@ -149,14 +137,15 @@ files:
 - doc/rdoc/classes/Mongrel/Configurator.src/M000112.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000113.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000114.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000115.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000058.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000059.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000060.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000061.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000062.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000063.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000115.html
 - doc/rdoc/classes/Mongrel/Error404Handler.src/M000116.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000117.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000072.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000073.html
 - doc/rdoc/classes/Mongrel/HttpHandler.src/M000074.html
@@ -169,10 +158,10 @@ files:
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000055.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000056.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000057.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000117.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000118.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000119.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000120.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000121.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000075.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000076.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000077.html
@@ -215,15 +204,14 @@ files:
 - doc/rdoc/classes/ObjectTracker.src/M000017.html
 - doc/rdoc/classes/ObjectTracker.src/M000018.html
 - doc/rdoc/classes/ObjectTracker.src/M000019.html
-- doc/rdoc/classes/RequestLog/Files.html
+- doc/rdoc/classes/RequestLog/Access.src
 - doc/rdoc/classes/RequestLog/Files.src
-- doc/rdoc/classes/RequestLog/Objects.html
 - doc/rdoc/classes/RequestLog/Objects.src
-- doc/rdoc/classes/RequestLog/Params.html
 - doc/rdoc/classes/RequestLog/Params.src
-- doc/rdoc/classes/RequestLog/Files.src/M000121.html
-- doc/rdoc/classes/RequestLog/Objects.src/M000122.html
-- doc/rdoc/classes/RequestLog/Params.src/M000123.html
+- doc/rdoc/classes/RequestLog/Access.src/M000122.html
+- doc/rdoc/classes/RequestLog/Files.src/M000123.html
+- doc/rdoc/classes/RequestLog/Objects.src/M000124.html
+- doc/rdoc/classes/RequestLog/Params.src/M000125.html
 - doc/rdoc/classes/Stats.src/M000009.html
 - doc/rdoc/classes/Stats.src/M000010.html
 - doc/rdoc/classes/Stats.src/M000011.html
@@ -257,7 +245,6 @@ files:
 - test/test_stats.rb
 - test/test_uriclassifier.rb
 - test/test_ws.rb
-- lib/http11.bundle
 - lib/mongrel
 - lib/mongrel.rb
 - lib/mongrel/camping.rb
@@ -285,6 +272,7 @@ files:
 - examples/builder.rb
 - examples/mongrel_simple_ctrl.rb
 - examples/mongrel_simple_service.rb
+- examples/random_thrash.rb
 - examples/simpletest.rb
 - examples/webrick_compare.rb
 - examples/camping/blog.rb