mongrel 1.1.5-x86-mingw32 → 1.2.0.pre2-x86-mingw32

data/lib/mongrel.rb

@@ -9,7 +9,13 @@ require 'uri'
 require 'stringio'
 
 # Compiled Mongrel extension
-require 'http11'
+# support multiple ruby version (fat binaries under windows)
+begin
+  require 'http11'
+rescue LoadError
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/http11"
+end
 
 # Gem conditional loader
 require 'mongrel/gems'
@@ -200,7 +206,7 @@ module Mongrel
           STDERR.puts "#{Time.now}: Client error: #{e.inspect}"
           STDERR.puts e.backtrace.join("\n")
         end
-        request.body.delete if request and request.body.class == Tempfile
+        request.body.close! if request and request.body.class == Tempfile
       end
     end
 
@@ -320,10 +326,15 @@ module Mongrel
     def register(uri, handler, in_front=false)
       begin
         @classifier.register(uri, [handler])
-      rescue URIClassifier::RegistrationError
+      rescue URIClassifier::RegistrationError => e
         handlers = @classifier.resolve(uri)[2]
-        method_name = in_front ? 'unshift' : 'push'
-        handlers.send(method_name, handler)
+        if handlers
+          # Already registered
+          method_name = in_front ? 'unshift' : 'push'
+          handlers.send(method_name, handler)
+        else
+          raise
+        end
       end
       handler.listener = self
     end

data/lib/mongrel/cgi.rb

@@ -26,7 +26,7 @@ module Mongrel
   # Refer to DirHandler#can_serve for more information on this.
   class CGIWrapper < ::CGI
     public :env_table
-    attr_reader :options
+    attr_reader :head
     attr_accessor :handler
     # Set this to false if you want calls to CGIWrapper.out to not actually send
     # the response until you force it.
@@ -105,7 +105,7 @@ module Mongrel
         when Hash
           cookie.each_value {|c| to['Set-Cookie'] = c.to_s}
         else
-          to['Set-Cookie'] = options['cookie'].to_s
+          to['Set-Cookie'] = head['cookie'].to_s
         end
         
         @head.delete('cookie')

data/lib/mongrel/command.rb

@@ -61,9 +61,7 @@ module Mongrel
         # I need to add my own -v definition to prevent the -v from exiting by default as well.
         @opt.on_tail("--version", "Show version") do
           @done_validating = true
-          if VERSION
-            puts "Version #{Mongrel::Const::MONGREL_VERSION}"
-          end
+          puts "Version #{Mongrel::Const::MONGREL_VERSION}"
         end
 
         @opt.parse! argv

data/lib/mongrel/configurator.rb

@@ -81,13 +81,13 @@ module Mongrel
 
     # Writes the PID file if we're not on Windows.
     def write_pid_file
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      if RUBY_PLATFORM !~ /mingw|mswin/
         log "Writing PID file to #{@pid_file}"
         open(@pid_file,"w") {|f| f.write(Process.pid) }
         open(@pid_file,"w") do |f|
           f.write(Process.pid)
           File.chmod(0644, @pid_file)
-        end      
+        end
       end
     end
 
@@ -185,7 +185,7 @@ module Mongrel
     def daemonize(options={})
       ops = resolve_defaults(options)
       # save this for later since daemonize will hose it
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      if RUBY_PLATFORM !~ /mingw|mswin/
         require 'daemons/daemonize'
 
         logfile = ops[:log_file]
@@ -344,7 +344,7 @@ module Mongrel
     # it reads it in and does an eval on the contents passing in the right
     # binding so they can put their own Configurator statements.
     def run_config(script)
-      open(script) {|f| eval(f.read, proc {self}) }
+      open(script) {|f| eval(f.read, proc {self}.binding) }
     end
 
     # Sets up the standard signal handlers that are used on most Ruby
@@ -366,7 +366,7 @@ module Mongrel
       # clean up the pid file always
       at_exit { remove_pid_file }
 
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      if RUBY_PLATFORM !~ /mingw|mswin/
         # graceful shutdown
         trap("TERM") { log "TERM signal received."; stop }
         trap("USR1") { log "USR1 received, toggling $mongrel_debug_client to #{!$mongrel_debug_client}"; $mongrel_debug_client = !$mongrel_debug_client }

data/lib/mongrel/const.rb

@@ -65,7 +65,7 @@ module Mongrel
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
 
-    MONGREL_VERSION="1.1.5".freeze
+    MONGREL_VERSION = VERSION = "1.2.0.pre2".freeze
 
     MONGREL_TMP_BASE="mongrel".freeze
 

data/lib/mongrel/handlers.rb

@@ -205,11 +205,11 @@ module Mongrel
       # test to see if this is a conditional request, and test if
       # the response would be identical to the last response
       same_response = case
-                      when modified_since && !last_response_time = Time.httpdate(modified_since) rescue nil : false
-                      when modified_since && last_response_time > Time.now                                  : false
-                      when modified_since && mtime > last_response_time                                     : false
-                      when none_match     && none_match == '*'                                              : false
-                      when none_match     && !none_match.strip.split(/\s*,\s*/).include?(etag)              : false
+                      when modified_since && !last_response_time = Time.httpdate(modified_since) rescue nil then false
+                      when modified_since && last_response_time > Time.now                                  then false
+                      when modified_since && mtime > last_response_time                                     then false
+                      when none_match     && none_match == '*'                                              then false
+                      when none_match     && !none_match.strip.split(/\s*,\s*/).include?(etag)              then false
                       else modified_since || none_match  # validation successful if we get this far and at least one of the header exists
                       end
 

data/lib/mongrel/http_request.rb

@@ -93,7 +93,7 @@ module Mongrel
         STDERR.puts e.backtrace.join("\n")
         # any errors means we should delete the file, including if the file is dumped
         @socket.close rescue nil
-        @body.delete if @body.class == Tempfile
+        @body.close! if @body.class == Tempfile
         @body = nil # signals that there was a problem
       end
     end

data/lib/mongrel/http_response.rb

@@ -75,7 +75,10 @@ module Mongrel
       elsif @header_sent
         raise "You have already sent the request headers."
       else
-        @header.out.truncate(0)
+        # XXX Dubious ( http://mongrel.rubyforge.org/ticket/19 )
+        @header.out.close
+        @header = HeaderOut.new(StringIO.new) 
+        
         @body.close
         @body = StringIO.new
       end

data/lib/mongrel/rails.rb

@@ -173,7 +173,7 @@ module Mongrel
         ops = resolve_defaults(options)
         setup_signals(options)
 
-        if RUBY_PLATFORM !~ /mswin|mingw/
+        if RUBY_PLATFORM !~ /mingw|mswin/
           # rails reload
           trap("HUP") { log "HUP signal received."; reload!          }
 

data/tasks/gem.rake

@@ -0,0 +1,28 @@
+require 'hoe'
+
+HOE = Hoe.spec 'mongrel' do
+  self.rubyforge_name = 'mongrel'
+  developer 'Zed A. Shaw', 'mongrel-users@rubyforge.org'
+
+  spec_extras[:required_ruby_version] = Gem::Requirement.new('>= 1.8.6')
+
+  spec_extras[:extensions] = ["ext/http11/extconf.rb"]
+  spec_extras[:executables] = ['mongrel_rails']
+
+  extra_rdoc_files << 'LICENSE'
+
+  extra_deps << ['gem_plugin', '~> 0.2.3']
+  extra_deps << ['daemons', '~> 1.0.10']
+
+  extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
+
+  clean_globs.push('test_*.log', 'log')
+end
+
+file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
+  puts "Generating #{t.name}"
+  File.open(t.name, 'w') { |f| f.puts HOE.spec.to_yaml }
+end
+
+desc "Generate or update the standalone gemspec file for the project"
+task :gemspec => ["#{HOE.spec.name}.gemspec"]

data/tasks/native.rake

@@ -0,0 +1,24 @@
+# use rake-compiler for building the extension
+require 'rake/extensiontask'
+
+# build http11 C extension
+Rake::ExtensionTask.new('http11', HOE.spec) do |ext|
+  # define target for extension (supporting fat binaries)
+  if RUBY_PLATFORM =~ /mingw|mswin/ then
+    RUBY_VERSION =~ /(\d+\.\d+)/
+    ext.lib_dir = "lib/#{$1}"
+  end
+
+  # define cross-compilation tasks when not on Windows.
+  unless RUBY_PLATFORM =~ /mingw|mswin/ then
+    ext.cross_compile = true
+    ext.cross_platform = ['i386-mswin32', 'i386-mingw32']
+
+    ext.cross_compiling do |gs|
+      gs.dependencies.delete gs.dependencies.find { |d| d.name == 'daemons' }
+    end
+  end
+end
+
+# ensure things are built prior testing
+task :test => [:compile]

data/tasks/ragel.rake

@@ -0,0 +1,20 @@
+
+# the following tasks ease the build of C file from Ragel one
+
+file 'ext/http11/http11_parser.c' => ['ext/http11/http11_parser.rl'] do |t|
+  begin
+    sh "ragel #{t.prerequisites.last} -C -G2 -o #{t.name}"
+  rescue
+    fail "Could not build wrapper using Ragel (it failed or not installed?)"
+  end
+end
+
+file 'ext/http11/org/jruby/mongrel/Http11Parser.java' => ['ext/http11/http11_parser.java.rl'] do |t|
+  begin
+    sh "ragel #{t.prerequisites.last} -J -G2 -o #{t.name}"
+  rescue
+    fail "Could not build wrapper using Ragel (it failed or not installed?)"
+  end
+end
+
+task :ragel => (defined?(JRUBY_VERSION) ? 'ext/http11/org/jruby/mongrel/Http11Parser.java' : 'ext/http11/http11_parser.c')

data/test/test_conditional.rb

@@ -10,14 +10,14 @@ include Mongrel
 
 class ConditionalResponseTest < Test::Unit::TestCase
   def setup
-    @server = HttpServer.new('127.0.0.1', process_based_port)
+    @server = HttpServer.new('127.0.0.1', 3501)
     @server.register('/', Mongrel::DirHandler.new('.'))
     @server.run
     
     @http = Net::HTTP.new(@server.host, @server.port)
 
     # get the ETag and Last-Modified headers
-    @path = '/README'
+    @path = '/README.txt'
     res = @http.start { |http| http.get(@path) }
     assert_not_nil @etag = res['ETag']
     assert_not_nil @last_modified = res['Last-Modified']

data/test/test_configurator.rb

@@ -30,11 +30,10 @@ class ConfiguratorTest < Test::Unit::TestCase
 
   def test_base_handler_config
     @config = nil
-    @port = process_based_port
 
     redirect_test_io do
       @config = Mongrel::Configurator.new :host => "localhost" do
-        listener :port => process_based_port do
+        listener :port => 4501 do
           # 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")
@@ -65,12 +64,12 @@ class ConfiguratorTest < Test::Unit::TestCase
       assert listener.classifier.uris.include?("/test"), "/test not registered"
     end
 
-    res = Net::HTTP.get(URI.parse("http://localhost:#{@port}/test"))
+    res = Net::HTTP.get(URI.parse('http://localhost:4501/test'))
     assert res != nil, "Didn't get a response"
     assert $test_plugin_fired == 3, "Test filter plugin didn't run 3 times."
 
     redirect_test_io do
-      res = Net::HTTP.get(URI.parse("http://localhost:#{@port}/"))
+      res = Net::HTTP.get(URI.parse('http://localhost:4501/'))
 
       assert res != nil, "Didn't get a response"
       assert $test_plugin_fired == 6, "Test filter plugin didn't run 6 times."
@@ -81,7 +80,7 @@ class ConfiguratorTest < Test::Unit::TestCase
     end
 
     assert_raise Errno::EBADF, Errno::ECONNREFUSED do
-      res = Net::HTTP.get(URI.parse("http://localhost:#{@port}/"))
+      res = Net::HTTP.get(URI.parse("http://localhost:4501/"))
     end
   end
 

data/test/test_handlers.rb

@@ -34,11 +34,10 @@ end
 class HandlersTest < Test::Unit::TestCase
 
   def setup
-    @port = process_based_port
     stats = Mongrel::StatisticsFilter.new(:sample_rate => 1)
 
-    @config = Mongrel::Configurator.new :host => '127.0.0.1' do
-      listener :port => process_based_port do
+    @config = Mongrel::Configurator.new :host => '127.0.0.1', :port => 9998 do
+      listener do
         uri "/", :handler => SimpleHandler.new
         uri "/", :handler => stats
         uri "/404", :handler => Mongrel::Error404Handler.new("Not found")
@@ -51,10 +50,8 @@ class HandlersTest < Test::Unit::TestCase
       end
     end
 
-    @test_file = windows? ? "testfile" : "tmp/testfile"
-
-    File.open("/#{@test_file}", 'w') do
-      # Do nothing
+    unless windows?
+      File.open("/tmp/testfile", 'w') { } # Do nothing
     end
 
     @config.run
@@ -62,40 +59,52 @@ class HandlersTest < Test::Unit::TestCase
 
   def teardown
     @config.stop(false, true)
-    File.delete "/#{@test_file}"
+    File.delete "/tmp/testfile" unless windows?
+  end
+  
+  def test_registration_exception_is_not_lost
+    assert_raises(Mongrel::URIClassifier::RegistrationError) do      
+      @config = Mongrel::Configurator.new do
+        listener do
+          uri "bogus", :handler => SimpleHandler.new
+        end
+      end
+    end
   end
 
   def test_more_web_server
-    res = hit([ "http://localhost:#{@port}/test",
-          "http://localhost:#{@port}/dumb",
-          "http://localhost:#{@port}/404",
-          "http://localhost:#{@port}/files/rdoc/index.html",
-          "http://localhost:#{@port}/files/rdoc/nothere.html",
-          "http://localhost:#{@port}/files/rdoc/",
-          "http://localhost:#{@port}/files_nodir/rdoc/",
-          "http://localhost:#{@port}/status",
+    res = hit([ "http://localhost:9998/test",
+          "http://localhost:9998/dumb",
+          "http://localhost:9998/404",
+          "http://localhost:9998/files/rdoc/index.html",
+          "http://localhost:9998/files/rdoc/nothere.html",
+          "http://localhost:9998/files/rdoc/",
+          "http://localhost:9998/files_nodir/rdoc/",
+          "http://localhost:9998/status",
     ])
     check_status res, String
   end
 
   def test_nil_dirhandler
+    return if windows?
+
     # Camping uses this internally
     handler = Mongrel::DirHandler.new(nil, false)
-    assert handler.can_serve("/#{@test_file}")
+    assert handler.can_serve("/tmp/testfile")
     # Not a bug! A nil @file parameter is the only circumstance under which
     # we are allowed to serve any existing file
-    assert handler.can_serve("../../../../../../../../../../#{@test_file}")
+    assert handler.can_serve("../../../../../../../../../../tmp/testfile")
   end
   
   def test_non_nil_dirhandler_is_not_vulnerable_to_path_traversal
     # The famous security bug of Mongrel 1.1.2
     handler = Mongrel::DirHandler.new("/doc", false)
-    assert_nil handler.can_serve("/#{@test_file}")
-    assert_nil handler.can_serve("../../../../../../../../../../#{@test_file}")
+    assert_nil handler.can_serve("/tmp/testfile")
+    assert_nil handler.can_serve("../../../../../../../../../../tmp/testfile")
   end
 
   def test_deflate
-    Net::HTTP.start("localhost", @port) do |h|
+    Net::HTTP.start("localhost", 9998) do |h|
       # Test that no accept-encoding returns a non-deflated response
       req = h.get("/dumb")
       assert(
@@ -113,14 +122,14 @@ class HandlersTest < Test::Unit::TestCase
 
   # TODO: find out why this fails on win32 but nowhere else
   #def test_posting_fails_dirhandler
-  #  req = Net::HTTP::Post.new("http://localhost:#{@port}/files/rdoc/")
+  #  req = Net::HTTP::Post.new("http://localhost:9998/files/rdoc/")
   #  req.set_form_data({'from'=>'2005-01-01', 'to'=>'2005-03-31'}, ';')
-  #  res = hit [["http://localhost:#{@port}/files/rdoc/",req]]
+  #  res = hit [["http://localhost:9998/files/rdoc/",req]]
   #  check_status res, Net::HTTPNotFound
   #end
 
   def test_unregister
-    @config.listeners["127.0.0.1:#{@port}"].unregister("/")
+    @config.listeners["127.0.0.1:9998"].unregister("/")
   end
 end
 

data/test/test_redirect_handler.rb

@@ -9,12 +9,11 @@ require 'test/testhelp'
 class RedirectHandlerTest < Test::Unit::TestCase
 
   def setup
-    @port = process_based_port
     redirect_test_io do
-      @server = Mongrel::HttpServer.new('127.0.0.1', @port)
+      @server = Mongrel::HttpServer.new('127.0.0.1', 9998)
     end
     @server.run
-    @client = Net::HTTP.new('127.0.0.1', @port)
+    @client = Net::HTTP.new('127.0.0.1', 9998)
   end
 
   def teardown

data/test/test_request_progress.rb

@@ -38,9 +38,8 @@ end
 
 class RequestProgressTest < Test::Unit::TestCase
   def setup
-    @port = process_based_port
     redirect_test_io do
-      @server = Mongrel::HttpServer.new("127.0.0.1", @port)
+      @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
     end
     @handler = UploadBeginHandler.new
     @server.register("/upload", @handler)
@@ -52,7 +51,7 @@ class RequestProgressTest < Test::Unit::TestCase
   end
 
   def test_begin_end_progress
-    Net::HTTP.get("localhost", "/upload", @port)
+    Net::HTTP.get("localhost", "/upload", 9998)
     assert @handler.request_began
     assert @handler.request_progressed
     assert @handler.request_processed
@@ -63,7 +62,7 @@ class RequestProgressTest < Test::Unit::TestCase
     handlers.each { |h| h.reset }
 
     # make the call
-    Net::HTTP.get("localhost", "/upload", @port)
+    Net::HTTP.get("localhost", "/upload", 9998)
 
     # assert that each one was fired
     handlers.each { |h|
@@ -89,7 +88,7 @@ class RequestProgressTest < Test::Unit::TestCase
     # remove handlers to make sure they've all gone away
     @server.unregister("/upload")
     handlers.each { |h| h.reset }
-    Net::HTTP.get("localhost", "/upload", @port)
+    Net::HTTP.get("localhost", "/upload", 9998)
     handlers.each { |h|
       assert !h.request_began && !h.request_progressed && !h.request_processed
     }