mongrel 0.3.12.4 → 0.3.13

data/test/test_http11.rb

@@ -1,3 +1,21 @@
+# Mongrel Web Server - A Mostly Ruby Webserver and Library
+#
+# Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 require 'test/unit'
 require 'http11'
 require 'mongrel'
@@ -12,7 +30,7 @@ class HttpParserTest < Test::Unit::TestCase
     parser = HttpParser.new
     req = {}
     http = "GET / HTTP/1.1\r\n\r\n"
-    nread = parser.execute(req, http);
+    nread = parser.execute(req, http, 0)
     assert nread == http.length, "Failed to parse the full HTTP request"
     assert parser.finished?, "Parser didn't finish"
     assert !parser.error?, "Parser had error"
@@ -29,7 +47,7 @@ class HttpParserTest < Test::Unit::TestCase
 
     error = false
     begin
-      nread = parser.execute(req, bad_http)
+      nread = parser.execute(req, bad_http, 0)
     rescue => details
       error = true
     end
@@ -61,7 +79,7 @@ class HttpParserTest < Test::Unit::TestCase
     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.execute({}, get, 0)
         parser.reset
       end
     end
@@ -70,7 +88,7 @@ class HttpParserTest < Test::Unit::TestCase
     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.execute({}, get, 0)
         parser.reset
       end
     end
@@ -79,7 +97,7 @@ class HttpParserTest < Test::Unit::TestCase
     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.execute({}, get, 0)
         parser.reset
       end
     end
@@ -88,7 +106,7 @@ class HttpParserTest < Test::Unit::TestCase
     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.execute({}, get, 0)
       parser.reset
     end
 
@@ -96,7 +114,7 @@ class HttpParserTest < Test::Unit::TestCase
     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.execute({}, get, 0)
         parser.reset
       end
     end
@@ -106,11 +124,11 @@ class HttpParserTest < Test::Unit::TestCase
 
 
   def test_query_parse
-    res = HttpRequest.query_parse("zed=1&frank=2")
+    res = HttpRequest.query_parse("zed=1&frank=#{HttpRequest.escape('&&& ')}")
     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"
+    assert_equal "&&& ", HttpRequest.unescape(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"

data/test/test_response.rb

@@ -1,3 +1,21 @@
+# Mongrel Web Server - A Mostly Ruby Webserver and Library
+#
+# Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 require 'test/unit'
 require 'mongrel'
 require 'benchmark'
@@ -44,6 +62,26 @@ class ResponseTest < Test::Unit::TestCase
     assert io.length > 0, "output didn't have data"
   end
 
+  def test_response_file
+    contents = "PLAIN TEXT\r\nCONTENTS\r\n"
+    require 'tempfile'
+    tmpf = Tempfile.new("test_response_file")
+    tmpf.binmode
+    tmpf.write(contents)
+    tmpf.rewind
 
+    io = StringIO.new
+    resp = HttpResponse.new(io)
+    resp.start(200) do |head,out|
+      head['Content-Type'] = 'text/plain'
+      resp.send_header
+      resp.send_file(tmpf.path)
+    end
+    io.rewind
+    tmpf.close
+    
+    assert io.length > 0, "output didn't have data"
+    assert io.read[-contents.length..-1] == contents, "output doesn't end with file payload"
+  end
 end
 

data/test/test_stats.rb

@@ -1,5 +1,24 @@
+# Mongrel Web Server - A Mostly Ruby Webserver and Library
+#
+# Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 require 'test/unit'
 require 'mongrel/stats'
+require 'stringio'
 
 class StatsTest < Test::Unit::TestCase
 
@@ -9,7 +28,7 @@ class StatsTest < Test::Unit::TestCase
     s = Stats.new("test")
     t = Stats.new("time")
 
-    10000.times { s.sample(rand(20)); t.tick }
+    100.times { s.sample(rand(20)); t.tick }
 
     s.dump("FIRST", out)
     t.dump("FIRST", out)
@@ -19,7 +38,7 @@ class StatsTest < Test::Unit::TestCase
 
     s.reset
     t.reset
-    10000.times { s.sample(rand(20)); t.tick }
+    100.times { s.sample(rand(30)); t.tick }
     
     s.dump("SECOND", out)
     t.dump("SECOND", out)

data/test/test_uriclassifier.rb

@@ -1,3 +1,21 @@
+# Mongrel Web Server - A Mostly Ruby Webserver and Library
+#
+# Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 require 'test/unit'
 require 'net/http'
 require 'mongrel'

data/test/test_ws.rb

@@ -1,33 +1,119 @@
+# Mongrel Web Server - A Mostly Ruby Webserver and Library
+#
+# Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 require 'test/unit'
 require 'net/http'
 require 'mongrel'
 require 'timeout'
-
-include Mongrel;
+require File.dirname(__FILE__) + "/testhelp.rb"
 
 class TestHandler < Mongrel::HttpHandler
-    attr_reader :ran_test
-    
-    def process(request, response)
-        @ran_test = true
-        response.socket.write("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\nhello!\n")
-    end
+  attr_reader :ran_test
+
+  def process(request, response)
+    @ran_test = true
+    response.socket.write("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\nhello!\n")
+  end
 end
-		
 
-class WSTest < Test::Unit::TestCase
 
-    def test_simple_server
-        h = HttpServer.new("0.0.0.0", 9998)
-        tester = TestHandler.new
-	h.register("/test", tester)
-        h.run 
+class WebServerTest < Test::Unit::TestCase
+
+  def setup
+    @request = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\n\r\n"
+    # we set num_processors=1 so that we can test the reaping code
+    @server = HttpServer.new("127.0.0.1", 9998,num_processors=1)
+    @tester = TestHandler.new
+    @server.register("/test", @tester)
+    @server.run 
+  end
+
+  def teardown
+    @server.stop
+  end
+
+  def test_simple_server
+    hit(['http://localhost:9998/test'])
+    assert @tester.ran_test, "Handler didn't really run"
+  end
+
+
+  def do_test(st, chunk, close_after=nil)
+    s = TCPSocket.new("127.0.0.1", 9998);
+    req = StringIO.new(st)
+    nout = 0
+
+    while data = req.read(chunk)
+      nout += s.write(data)
+      s.flush
+      sleep 0.2
+      if close_after and nout > close_after
+        s.close_write
+        sleep 1
+      end
+    end
+    s.write(" ") if RUBY_PLATFORM =~ /mswin/
+    s.close
+  end
+
+  def test_trickle_attack
+    do_test(@request, 3)
+  end
+
+  def test_close_client
+    assert_raises IOError do
+      do_test(@request, 10, 20)
+    end
+  end
+
+  def test_bad_client
+    redirect_test_io do
+      do_test("GET /test HTTP/BAD", 3)
+    end
+  end
 
-        sleep(1)
-        res = Net::HTTP.get(URI.parse('http://localhost:9998/test'))
-        assert res != nil, "Didn't get a response"
-	assert tester.ran_test, "Handler didn't really run"
+  def test_header_is_too_long
+    redirect_test_io do
+      long = "GET /test HTTP/1.1\r\n" + ("X-Big: stuff\r\n" * 15000) + "\r\n"
+      assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL do
+        do_test(long, long.length/2)
+      end
     end
+  end
+
+  def test_num_processors_overload
+    redirect_test_io do
+      assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL do
+        tests = [
+          Thread.new { do_test(@request, 1) },
+          Thread.new { do_test(@request, 10) },
+        ]
+
+        tests.each {|t| t.join}
+      end
+    end
+  end
+
+  def test_file_streamed_request
+    body = "a" * (Mongrel::Const::MAX_BODY * 2)
+    long = "GET /test HTTP/1.1\r\nContent-length: #{body.length}\r\n\r\n" + body
+    do_test(long, Mongrel::Const::CHUNK_SIZE * 2 -400)
+  end
 
 end
 

data/test/testhelp.rb

@@ -0,0 +1,36 @@
+def redirect_test_io
+  orig_err = STDERR.dup
+  orig_out = STDOUT.dup
+  STDERR.reopen("test_stderr.log")
+  STDOUT.reopen("test_stdout.log")
+
+  begin
+    yield
+  ensure
+    STDERR.reopen(orig_err)
+    STDOUT.reopen(orig_out)
+  end
+end
+
+
+# Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
+# HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
+def hit(uris)
+  results = []
+  uris.each do |u|
+    res = nil
+
+    if u.kind_of? String
+      res = Net::HTTP.get(URI.parse(u))
+    else
+      url = URI.parse(u[0])
+      res = Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
+    end
+
+    assert res != nil, "Didn't get a response: #{u}"
+    results << res
+  end
+
+  return results
+end
+

data/tools/rakehelp.rb

@@ -1,66 +1,65 @@
-
 def make(makedir)
-    Dir.chdir(makedir) do
-        sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
-    end
+  Dir.chdir(makedir) do
+    sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
+  end
 end
 
 
 def extconf(dir)
-    Dir.chdir(dir) do ruby "extconf.rb" end
+  Dir.chdir(dir) do ruby "extconf.rb" end
 end
 
 
 def setup_tests
-    Rake::TestTask.new do |t|
-        t.libs << "test"
-        t.test_files = FileList['test/test*.rb']
-        t.verbose = true
-    end
+  Rake::TestTask.new do |t|
+    t.libs << "test"
+    t.test_files = FileList['test/test*.rb']
+    t.verbose = true
+  end
 end
 
 
 def setup_clean otherfiles
-    files = ['build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log'] + otherfiles
-    CLEAN.include(files)
+  files = ['build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log'] + otherfiles
+  CLEAN.include(files)
 end
 
 
 def setup_rdoc files
-    Rake::RDocTask.new do |rdoc|
-        rdoc.rdoc_dir = 'doc/rdoc'
-        rdoc.options << '--line-numbers'
-        rdoc.rdoc_files.add(files)
-    end
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'doc/rdoc'
+    rdoc.options << '--line-numbers'
+    rdoc.rdoc_files.add(files)
+  end
 end
 
 
 def setup_extension(dir, extension)
-    ext = "ext/#{dir}"
-    ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-    ext_files = FileList[
+  ext = "ext/#{dir}"
+  ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
+  ext_files = FileList[
     "#{ext}/*.c",
     "#{ext}/*.h",
     "#{ext}/extconf.rb",
     "#{ext}/Makefile",
     "lib"
-    ] 
-    
-    task "lib" do
-        directory "lib"
-    end
+  ] 
 
-    desc "Builds just the #{extension} extension"
-    task extension.to_sym => ["#{ext}/Makefile", ext_so ]
+  task "lib" do
+    directory "lib"
+  end
 
-    file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
-        extconf "#{ext}"
-    end
+  desc "Builds just the #{extension} extension"
+  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
 
-    file ext_so => ext_files do
-        make "#{ext}"
-        cp ext_so, "lib"
-    end
+  file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
+    extconf "#{ext}"
+  end
+
+  file ext_so => ext_files do
+    make "#{ext}"
+    cp ext_so, "lib"
+  end
 end
 
 
@@ -74,13 +73,13 @@ def base_gem_spec(pkg_name, pkg_version)
     s.platform = Gem::Platform::RUBY
     s.has_rdoc = true
     s.extra_rdoc_files = [ "README" ]
-    
+
     s.files = %w(COPYING LICENSE README Rakefile) +
       Dir.glob("{bin,doc/rdoc,test,lib}/**/*") + 
       Dir.glob("ext/**/*.{h,c,rb}") +
       Dir.glob("examples/**/*.rb") +
       Dir.glob("tools/*.rb")
-    
+
     s.require_path = "lib"
     s.extensions = FileList["ext/**/extconf.rb"].to_a
     s.bindir = "bin"
@@ -90,22 +89,29 @@ end
 def setup_gem(pkg_name, pkg_version)
   spec = base_gem_spec(pkg_name, pkg_version)
   yield spec if block_given?
-    
+
   Rake::GemPackageTask.new(spec) do |p|
     p.gem_spec = spec
-    p.need_tar = true
+    p.need_tar = true if RUBY_PLATFORM !~ /mswin/
   end
 end
 
-def setup_win32_gem(pkg_name, pkg_version)
-  spec = base_gem_spec(pkg_name, pkg_version)
-  yield spec if block_given?
-
-  Gem::Builder.new(spec).build
-end
-
 def sub_project(project, *targets)
   targets.each do |target|
-    sh %{cd projects/#{project}; rake #{target.to_s}; }
+    Dir.chdir "projects/#{project}" do
+      sh %{rake --trace #{target.to_s} }
+    end
+  end
+end
+
+# Conditional require rcov/rcovtask if present
+begin
+  require 'rcov/rcovtask'
+  
+  Rcov::RcovTask.new do |t|
+    t.test_files = FileList['test/test*.rb']
+    t.rcov_opts << "-x /usr"
+    t.output_dir = "test/coverage"
   end
+rescue Object
 end