mongrel 1.0.1 → 1.0.2

data/lib/mongrel/debug.rb

@@ -7,17 +7,14 @@
 require 'logger'
 require 'set'
 require 'socket'
-
-
-
-$mongrel_debugging=true
+require 'fileutils'
 
 module MongrelDbg
   SETTINGS = { :tracing => {}}
   LOGGING = { }
 
   def MongrelDbg::configure(log_dir = File.join("log","mongrel_debug"))
-    Dir.mkdir(log_dir) if not File.exist?(log_dir)
+    FileUtils.mkdir_p(log_dir)
     @log_dir = log_dir
     $objects_out=open(File.join("log","mongrel_debug","objects.log"),"w")
     $objects_out.puts "run,classname,last,count,delta,lenmean,lensd,lenmax"

data/lib/mongrel/handlers.rb

@@ -98,6 +98,10 @@ module Mongrel
   # that the final expanded path includes the root path.  If it doesn't
   # than it simply gives a 404.
   #
+  # If you pass nil as the root path, it will not check any locations or
+  # expand any paths. This lets you serve files from multiple directories
+  # on win32.
+  #
   # 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.
@@ -110,9 +114,9 @@ module Mongrel
 
     ONLY_HEAD_GET="Only HEAD and GET allowed.".freeze
 
-    # You give it the path to the directory root and an (optional) 
+    # You give it the path to the directory root and and optional listing_allowed and index_html
     def initialize(path, listing_allowed=true, index_html="index.html")
-      @path = File.expand_path(path)
+      @path = File.expand_path(path) if path
       @listing_allowed=listing_allowed
       @index_html = index_html
       @default_content_type = "application/octet-stream".freeze
@@ -120,7 +124,13 @@ module Mongrel
 
     # Checks if the given path can be served and returns the full path (or nil if not).
     def can_serve(path_info)
-      req_path = File.expand_path(File.join(@path,HttpRequest.unescape(path_info)), @path)
+
+      req_path = HttpRequest.unescape(path_info)
+      if @path
+        req_path = File.expand_path(File.join(@path, path_info), @path)
+      else
+        req_path = File.expand_path(req_path)
+      end
 
       if req_path.index(@path) == 0 and File.exist? req_path
         # it exists and it's in the right location
@@ -208,11 +218,14 @@ module Mongrel
       if same_response
         response.start(304) {}
       else
-        # first we setup the headers and status then we do a very fast send on the socket directly
-        response.status = 200
+        
+        # First we setup the headers and status then we do a very fast send on the socket directly
+        
+        # Support custom responses except 404, which is the default. A little awkward. 
+        response.status = 200 if response.status == 404        
         header[Const::LAST_MODIFIED] = mtime.httpdate
 
-        # set the mime type from our map based on the ending
+        # Set the mime type from our map based on the ending
         dot_at = req_path.rindex('.')
         if dot_at
           header[Const::CONTENT_TYPE] = MIME_TYPES[req_path[dot_at .. -1]] || @default_content_type
@@ -374,6 +387,7 @@ module Mongrel
       results << table("settings", [
                        ["host",listener.host],
                        ["port",listener.port],
+                       ["throttle",listener.throttle],
                        ["timeout",listener.timeout],
                        ["workers max",listener.num_processors],
       ])
@@ -384,8 +398,8 @@ module Mongrel
       end
 
       results << "<h2>Registered Handlers</h2>"
-      uris = listener.classifier.handler_map
-      results << table("handlers", uris.map {|uri,handlers| 
+      handler_map = listener.classifier.handler_map
+      results << table("handlers", handler_map.map {|uri,handlers| 
         [uri, 
             "<pre>" + 
             handlers.map {|h| h.class.to_s }.join("\n") + 
@@ -430,7 +444,7 @@ module Mongrel
 
     def initialize(pattern, replacement = nil, &block)
       unless replacement or block
-        @replacement = pattern
+        @pattern, @replacement = nil, pattern
       else
         @pattern, @replacement, @block = pattern, replacement, block
       end

data/lib/mongrel/mime_types.yml

@@ -18,7 +18,7 @@
 .asp: text/asp
 .asr: video/x-ms-asf
 .asx: video/x-ms-asf
-.atom: application/xml+atom
+.atom: application/atom+xml
 .au: audio/basic
 .au: audio/x-au
 .avi: video/avi
@@ -605,6 +605,7 @@
 .xpix: application/x-vnd.ls-xpix
 .xpm: image/x-xpixmap
 .xpm: image/xpm
+.xsl: application/xslt+xml
 .xsr: video/x-amt-showrun
 .xwd: image/x-xwd
 .xwd: image/x-xwindowdump

data/lib/mongrel/rails.rb

@@ -37,7 +37,6 @@ module Mongrel
       def initialize(dir, mime_map = {})
         @files = Mongrel::DirHandler.new(dir,false)
         @guard = Mutex.new
-        @tick = Time.now
 
         # Register the requested MIME types
         mime_map.each {|k,v| Mongrel::DirHandler::add_mime_type(k,v) }
@@ -49,12 +48,13 @@ module Mongrel
       # * If it exists at PATH_INFO+".html" exists then serve that.
       # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
       def process(request, response)
-        if response.socket.closed?
-          return
-        end
-
+        return if response.socket.closed?
+        
         path_info = request.params[Mongrel::Const::PATH_INFO]
-        page_cached = path_info + ActionController::Base.page_cache_extension
+        rest_operator = request.params[Mongrel::Const::REQUEST_URI][/^#{Regexp.escape path_info}(;[^\?]+)/, 1].to_s
+        path_info.chomp!("/")
+        
+        page_cached = path_info + rest_operator + ActionController::Base.page_cache_extension
         get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
 
         if get_or_head and @files.can_serve(path_info)
@@ -71,10 +71,8 @@ module Mongrel
             # We don't want the output to be really final until we're out of the lock
             cgi.default_really_final = false
 
-            log_threads_waiting_for(@active_request_path || request.params["PATH_INFO"]) if $mongrel_debug_client
-
             @guard.synchronize {
-              @active_request_path = request.params["PATH_INFO"] 
+              @active_request_path = request.params[Mongrel::Const::PATH_INFO] 
               Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body)
               @active_request_path = nil
             }
@@ -90,12 +88,6 @@ module Mongrel
         end
       end
 
-      def log_threads_waiting_for(event)
-        if Time.now - @tick > 10
-          @tick = Time.now
-        end
-      end
-
       # Does the internal reload for Rails.  It might work for most cases, but
       # sometimes you get exceptions.  In that case just do a real restart.
       def reload!

data/mongrel-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDUDCCAjigAwIBAgIBADANBgkqhkiG9w0BAQUFADBOMRwwGgYDVQQDDBNtb25n
+cmVsLWRldmVsb3BtZW50MRkwFwYKCZImiZPyLGQBGRYJcnVieWZvcmdlMRMwEQYK
+CZImiZPyLGQBGRYDb3JnMB4XDTA3MDkxNjEwMzI0OVoXDTA4MDkxNTEwMzI0OVow
+TjEcMBoGA1UEAwwTbW9uZ3JlbC1kZXZlbG9wbWVudDEZMBcGCgmSJomT8ixkARkW
+CXJ1Ynlmb3JnZTETMBEGCgmSJomT8ixkARkWA29yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMb9v3B01eOHk3FyypbQgKXzJplUE5P6dXoG+xpPm0Lv
+P7BQmeMncOwqQ7zXpVQU+lTpXtQFTsOE3vL7KnhQFJKGvUAkbh24VFyopu1I0yqF
+mGu4nRqNXGXVj8TvLSj4S1WpSRLAa0acLPNyKhGmoV9+crqQypSjM6XKjBeppifo
+4eBmWGjiJEYMIJBvJZPJ4rAVDDA8C6CM1m3gMBGNh8ELDhU8HI9AP3dMIkTI2Wx9
+9xkJwHdroAaS0IFFtYChrwee4FbCF1FHDgoTosMwa47DrLHg4hZ6ojaKwK5QVWEV
+XGb6ju5UqpktnSWF2W+Lvl/K0tI42OH2CAhebT1gEVUCAwEAAaM5MDcwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGHChyMSZ16u9WOzKhgJSQ9lqDc5
+MA0GCSqGSIb3DQEBBQUAA4IBAQA/lfeN2WdB1xN+82tT7vNS4HOjRQw6MUh5yktu
+GQjaGqm0UB+aX0Z9y0B0qpfv9rj7nmIvEGiwBmDepNWYCGuW15JyqpN7QVVnG2xS
+Mrame7VqgjM7A+VGDD5In5LtWbM/CHAATvvFlQ5Ph13YE1EdnVbZ65c+KQv+5sFY
+Q+zEop74d878uaC/SAHHXS46TiXneocaLSYw1CEZs/MAIy+9c4Q5ESbGpgnfg1Ad
+6lwl7k3hsNHO/+tZzx4HJtOXDI1yAl3+q6T9J0yI3z97EinwvAKhS1eyOI2Y5eeT
+tbQaNYkU127B3l/VNpd8fQm3Jkl/PqCCmDBQjUszFrJEODug
+-----END CERTIFICATE-----

data/mongrel.gemspec

@@ -0,0 +1,211 @@
+
+# Gem::Specification for Mongrel-1.0.2
+# Originally generated by Echoe
+
+Gem::Specification.new do |s|
+  s.name = %q{mongrel}
+  s.version = "1.0.2"
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Zed A. Shaw"]
+  s.date = %q{2007-10-26}
+  s.default_executable = %q{mongrel_rails}
+  s.description = %q{A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.}
+  s.email = %q{}
+  s.executables = ["mongrel_rails"]
+  s.extensions = ["ext/http11/extconf.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{}
+  s.require_paths = ["lib", "ext"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
+  s.rubyforge_project = %q{mongrel}
+  s.rubygems_version = %q{0.9.4.6}
+  s.summary = %q{A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.}
+  s.test_files = ["test/test_cgi_wrapper.rb", "test/test_command.rb", "test/test_conditional.rb", "test/test_configurator.rb", "test/test_debug.rb", "test/test_handlers.rb", "test/test_http11.rb", "test/test_redirect_handler.rb", "test/test_request_progress.rb", "test/test_response.rb", "test/test_stats.rb", "test/test_uriclassifier.rb", "test/test_ws.rb"]
+
+  s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
+  s.add_dependency(%q<cgi_multipart_eof_fix>, [">= 2.4"])
+  s.add_dependency(%q<daemons>, [">= 1.0.3"])
+  s.add_dependency(%q<fastthread>, [">= 1.0.1"])
+end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# 
+# require 'rubygems'
+# gem 'echoe', '>=2.6.4'
+# require 'echoe'
+# 
+# e = Echoe.new("mongrel") do |p|
+#   p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
+#   p.author ="Zed A. Shaw"
+#   p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config']
+#   p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc', 'ext/http11/http11.c']
+#   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
+#   p.ruby_version = '>= 1.8.4'
+#   p.dependencies = ['gem_plugin >=0.2.3', 'cgi_multipart_eof_fix >=2.4']
+# 
+#   p.need_tar_gz = false
+#   p.need_tgz = true
+# 
+#   case RUBY_PLATFORM 
+#   when /mswin/
+#   else
+#   end
+# 
+#   p.eval = proc do  
+#     case RUBY_PLATFORM
+#     when /mswin/
+#       extensions.clear
+#       self.files += ['lib/http11.so']
+#       self.platform = Gem::Platform::WIN32
+#     else
+#       add_dependency('daemons', '>= 1.0.3')
+#       add_dependency('fastthread', '>= 1.0.1')
+#     end
+#   end
+#   
+# end
+# 
+# #### Ragel builder
+# 
+# desc "Rebuild the Ragel sources"
+# task :ragel do
+#   Dir.chdir "ext/http11" do
+#     target = "http11_parser.c"
+#     File.unlink target if File.exist? target
+#     sh "ragel http11_parser.rl | rlgen-cd -G2 -o #{target}"
+#     raise "Failed to build C source" unless File.exist? target
+#   end
+# end
+# 
+# #### XXX Hack around RubyGems and Echoe for pre-compiled extensions.
+# 
+# def move_extensions
+#   Dir["ext/**/*.#{Config::CONFIG['DLEXT']}"].each { |file| cp file, "lib/" }
+# end
+# 
+# case RUBY_PLATFORM
+# when /mswin/
+#   filename = "lib/http11.so"
+#   file filename do
+#     Dir.chdir("ext/http11") do 
+#       ruby "extconf.rb"
+#       system(PLATFORM =~ /mswin/ ? 'nmake' : 'make')
+#     end
+#     move_extensions
+#   end 
+#   task :compile => [filename]
+# end
+# 
+# #### Project-wide install and uninstall tasks
+# 
+# def sub_project(project, *targets)
+#   targets.each do |target|
+#     Dir.chdir "projects/#{project}" do
+#       sh %{rake --trace #{target.to_s} }
+#     end
+#   end
+# end
+# 
+# desc "Package Mongrel and all subprojects"
+# task :package_all => [:package] do
+#   sub_project("gem_plugin", :package)
+#   sub_project("cgi_multipart_eof_fix", :package)
+#   sub_project("fastthread", :package)
+#   sub_project("mongrel_status", :package)
+#   sub_project("mongrel_upload_progress", :package)
+#   sub_project("mongrel_console", :package)
+#   sub_project("mongrel_cluster", :package)
+#   sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/
+# end
+# 
+# task :install_requirements do
+#   # These run before Mongrel is installed
+#   sub_project("gem_plugin", :install)
+#   sub_project("cgi_multipart_eof_fix", :install)
+#   sub_project("fastthread", :install)
+# end
+# 
+# desc "for Mongrel and all subprojects"
+# task :install => [:install_requirements] do
+#   # These run after Mongrel is installed
+#   sub_project("mongrel_status", :install)
+#   sub_project("mongrel_upload_progress", :install)
+#   sub_project("mongrel_console", :install)
+#   sub_project("mongrel_cluster", :install)  
+#   sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
+# end
+# 
+# desc "for Mongrel and all its subprojects"
+# task :uninstall => [:clean] do
+#   sub_project("mongrel_status", :uninstall)
+#   sub_project("cgi_multipart_eof_fix", :uninstall)
+#   sub_project("mongrel_upload_progress", :uninstall)
+#   sub_project("mongrel_console", :uninstall)
+#   sub_project("gem_plugin", :uninstall)
+#   sub_project("fastthread", :uninstall)  
+#   sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
+# end
+# 
+# desc "for Mongrel and all its subprojects"
+# task :clean do
+#   sub_project("gem_plugin", :clean)
+#   sub_project("cgi_multipart_eof_fix", :clean)
+#   sub_project("fastthread", :clean)
+#   sub_project("mongrel_status", :clean)
+#   sub_project("mongrel_upload_progress", :clean)
+#   sub_project("mongrel_console", :clean)
+#   sub_project("mongrel_cluster", :clean) 
+#   sub_project("mongrel_service", :clean) if RUBY_PLATFORM =~ /mswin/
+# end
+# 
+# #### Site upload tasks
+# 
+# namespace :site do
+# 
+#   desc "Package and upload .gem files and .tgz files for Mongrel and all subprojects to http://mongrel.rubyforge.org/releases/"
+#   task :source => [:package_all] do
+#     rm_rf "pkg/gems"
+#     rm_rf "pkg/tars"
+#     mkdir_p "pkg/gems"
+#     mkdir_p "pkg/tars"
+#    
+#     FileList["**/*.gem"].each { |gem| mv gem, "pkg/gems" }
+#     FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" }
+#     
+#     # XXX Hack, because only Luis can package for Win32 right now
+#     sh "cp ~/Downloads/mongrel-1.0.2-mswin32.gem pkg/gems/"
+#     sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"  
+#     sh "rm -rf pkg/mongrel*"
+#     sh "gem generate_index -d pkg"  
+#     sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/" 
+#     sh "svn log -v > SVN_LOG"
+#     sh "scp -r SVN_LOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/" 
+#     rm "SVN_LOG"  
+#   end
+#   
+#   desc "Upload the website"
+#   task :web do
+#     # Requires the 'webgem' gem and the 'atom-tools' gem
+#     sh "cd site; webgen; ruby atom.rb > output/feed.atom; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/"
+#   end
+#   
+#   desc "Upload the rdocs"
+#   task :rdoc => [:redoc] do
+#     sh "rsync -azv doc/* rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/"
+#     sh "cd projects/gem_plugin; rake site"
+#   end
+#   
+#   desc "Upload the coverage report"
+#   task :coverage => [:rcov] do
+#     sh "rsync -azv test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/"
+#   end
+#   
+#   desc "Upload the website, the rdocs, and the coverage report"
+#   task :all => [:web, :rdoc, :coverage]
+#   
+# end

data/test/jruby_socket.rb

@@ -0,0 +1,39 @@
+
+# Minimal test to help debug JRuby socket issues
+
+require 'socket'
+
+@server = Thread.new do 
+  server_socket = TCPServer.new('0.0.0.0', 10101)
+  this_client = server_socket.accept
+  4.times do |n|
+    begin
+      data = this_client.readpartial(2)
+      puts "Server got:  #{data}"
+      if n == 0
+        this_client.close 
+        puts "Server closed the client"
+      end
+    rescue IOError => e
+      puts "Server has: #{e.inspect}"
+    end
+    sleep(1)
+  end
+  server_socket.close
+end
+
+sleep(3)
+client_socket = TCPSocket.new('0.0.0.0', 10101)
+4.times do |n|
+  string = "X#{n}"
+  begin
+    client_socket.write(string)
+    puts "Client said: #{string}"
+  rescue Errno::EPIPE => e
+    puts "Client has: #{e.inspect}"
+  end
+  sleep(1)
+end
+client_socket.close
+
+@server.join

data/test/test_cgi_wrapper.rb

@@ -0,0 +1,26 @@
+
+require 'test/testhelp'
+
+class MockHttpRequest
+  attr_reader :body
+
+  def params
+    return { 'REQUEST_METHOD' => 'GET'}
+  end
+end
+
+class CGIWrapperTest < Test::Unit::TestCase
+  
+  def test_set_cookies_output_cookies
+    request = MockHttpRequest.new
+    response = nil # not needed for this test
+    output_headers = {}
+    
+    cgi = Mongrel::CGIWrapper.new(request, response) 
+    session = CGI::Session.new(cgi, 'database_manager' => CGI::Session::MemoryStore)
+    cgi.send_cookies(output_headers)
+    
+    assert(output_headers.has_key?("Set-Cookie"))
+    assert_equal("_session_id="+session.session_id+"; path=", output_headers["Set-Cookie"])
+  end
+end