mongrel 1.1 → 1.1.1

data/CHANGELOG

@@ -1,6 +1,10 @@
 
+v1.1.1. Fix mongrel_rails restart bug; fix bug with Rack status codes.
+
 v1.1. Pure Ruby URIClassifier. More modular architecture. JRuby support. Move C URIClassifier into mongrel_experimental project.
 
+v1.0.4. Backport fixes for versioning inconsistency, mongrel_rails bug, and DirHandler bug.
+
 v1.0.3. Fix user-switching bug; make people upgrade to the latest from the RC.
 
 v1.0.2. Signed gem; many minor bugfixes and patches.

data/bin/mongrel_rails

@@ -11,6 +11,8 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'mongrel'
 require 'mongrel/rails'
 
+Mongrel::Gems.require 'gem_plugin'
+
 # require 'ruby-debug'
 # Debugger.start
 

data/ext/http11/http11.c

@@ -384,7 +384,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 1.1");
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.1.1"); /* XXX Why is this defined here? */
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

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".freeze
+    MONGREL_VERSION="1.1.1".freeze
 
     MONGREL_TMP_BASE="mongrel".freeze
 

data/lib/mongrel/debug.rb

@@ -122,17 +122,20 @@ module RequestLog
       begin
         stats = Hash.new(0)
         lengths = {}
-        ObjectSpace.each_object do |o| 
-          begin
-            if o.respond_to? :length
-              len = o.length
-              lengths[o.class] ||= Mongrel::Stats.new(o.class)
-              lengths[o.class].sample(len)
+        begin
+          ObjectSpace.each_object do |o| 
+            begin
+              if o.respond_to? :length
+                len = o.length
+                lengths[o.class] ||= Mongrel::Stats.new(o.class)
+                lengths[o.class].sample(len)
+              end
+            rescue Object
             end
-          rescue Object
+  
+            stats[o.class] += 1
           end
-
-          stats[o.class] += 1
+        rescue Object # Ignore since ObjectSpace might not be loaded on JRuby
         end
 
         stats.sort {|(k1,v1),(k2,v2)| v2 <=> v1}.each do |k,v|
@@ -171,21 +174,23 @@ module RequestLog
 
     def process(request, response)
       MongrelDbg::trace(:threads, "#{Time.now} REQUEST #{request.params['PATH_INFO']}")
-      ObjectSpace.each_object do |obj|
-        begin
-          if obj.class == Mongrel::HttpServer
-            worker_list = obj.workers.list
-
-            if worker_list.length > 0
-              keys = "-----\n\tKEYS:"
-              worker_list.each {|t| keys << "\n\t\t-- #{t}: #{t.keys.inspect}" }
+      begin
+        ObjectSpace.each_object do |obj|
+          begin
+            if obj.class == Mongrel::HttpServer
+              worker_list = obj.workers.list
+  
+              if worker_list.length > 0
+                keys = "-----\n\tKEYS:"
+                worker_list.each {|t| keys << "\n\t\t-- #{t}: #{t.keys.inspect}" }
+              end
+  
+              MongrelDbg::trace(:threads, "#{obj.host}:#{obj.port} -- THREADS: #{worker_list.length} #{keys}")
             end
-
-            MongrelDbg::trace(:threads, "#{obj.host}:#{obj.port} -- THREADS: #{worker_list.length} #{keys}")
+          rescue Object # Ignore since obj.class can sometimes take parameters            
           end
-        rescue Object
-          # ignore since obj.class can sometimes take parameters
         end
+      rescue Object # Ignore since ObjectSpace might not be loaded on JRuby
       end
     end
   end

data/lib/mongrel/gems.rb

@@ -2,19 +2,18 @@ module Mongrel
   module Gems
     class << self
     
-      alias :original_require :require
-    
       def require(library, version = nil)
         begin
-          original_require library
+          Kernel.require library
         rescue LoadError, RuntimeError => e
-          unless respond_to? 'gem'
+          begin 
             # ActiveSupport breaks 'require' by making it always return a true value
             require 'rubygems'
-            gem library, version if version
-            retry 
+            version ? gem(library, version) : gem(library)
+            retry
+          rescue Gem::LoadError, LoadError, RuntimeError
+            # puts "** #{library.inspect} could not be loaded" unless library == "mongrel_experimental"
           end
-          # Fail without reraising
         end  
       end
       

data/lib/mongrel/http_response.rb

@@ -43,7 +43,7 @@ module Mongrel
       @socket = socket
       @body = StringIO.new
       @status = 404
-      @reason = HTTP_STATUS_CODES[@status]
+      @reason = nil
       @header = HeaderOut.new(StringIO.new)
       @header[Const::DATE] = Time.now.httpdate
       @body_sent = false
@@ -59,7 +59,7 @@ module Mongrel
     # by simple passing "finalize=true" to the start method.  By default
     # all handlers run and then mongrel finalizes the request when they're
     # all done.
-    def start(status=200, finalize=false, reason=HTTP_STATUS_CODES[status])
+    def start(status=200, finalize=false, reason=nil)
       @status = status.to_i
       @reason = reason
       yield @header, @body
@@ -84,7 +84,7 @@ module Mongrel
     def send_status(content_length=@body.length)
       if not @status_sent
         @header['Content-Length'] = content_length if content_length and @status != 304
-        write(Const::STATUS_FORMAT % [@status, @reason])
+        write(Const::STATUS_FORMAT % [@status, @reason || HTTP_STATUS_CODES[@status]])
         @status_sent = true
       end
     end

data/mongrel.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Mongrel-1.1
+# Gem::Specification for Mongrel-1.1.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{mongrel}
-  s.version = "1.1"
+  s.version = "1.1.1"
 
   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-11-01}
+  s.date = %q{2007-11-12}
   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{}
@@ -43,20 +43,21 @@ end
 #   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}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage']
-#   p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
+#   p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 #   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.rdoc_template = `allison --path`.chomp) rescue nil
 # 
 #   p.need_tar_gz = false
 #   p.need_tgz = true
 # 
-# #  case RUBY_PLATFORM 
-# #  when /mswin/
-# #  else
-# #  end
+#   #  case RUBY_PLATFORM
+#   #  when /mswin/
+#   #  else
+#   #  end
 # 
-#   p.eval = proc do  
+#   p.eval = proc do
 #     case RUBY_PLATFORM
 #     when /mswin/
 #       extensions.clear
@@ -71,7 +72,7 @@ end
 #       add_dependency('fastthread', '>= 1.0.1')
 #     end
 #   end
-#   
+# 
 # end
 # 
 # #### Ragel builder
@@ -107,10 +108,10 @@ end
 #   Dir["ext/**/*.#{Config::CONFIG['DLEXT']}"].each { |file| mv file, "lib/" }
 # end
 # 
-# def java_classpath_arg 
+# def java_classpath_arg
 #   # A myriad of ways to discover the JRuby classpath
 #   classpath = begin
-#     require 'java' 
+#     require 'java'
 #     # Already running in a JRuby JVM
 #     Java::java.lang.System.getProperty('java.class.path')
 #   rescue LoadError
@@ -123,12 +124,12 @@ end
 # when /mswin/
 #   filename = "lib/http11.so"
 #   file filename do
-#     Dir.chdir("ext/http11") do 
+#     Dir.chdir("ext/http11") do
 #       ruby "extconf.rb"
 #       system(PLATFORM =~ /mswin/ ? 'nmake' : 'make')
 #     end
 #     move_extensions
-#   end 
+#   end
 #   task :compile => [filename]
 # 
 # when /java/
@@ -139,8 +140,8 @@ end
 #     sources = FileList['ext/http11_java/**/*.java'].join(' ')
 #     sh "javac -target 1.4 -source 1.4 -d #{build_dir} #{java_classpath_arg} #{sources}"
 #     sh "jar cf lib/http11.jar -C #{build_dir} ."
-#     move_extensions      
-#   end      
+#     move_extensions
+#   end
 #   task :compile => [filename]
 # 
 # end
@@ -151,7 +152,7 @@ end
 #   targets.each do |target|
 #     Dir.chdir "projects/#{project}" do
 #       unless RUBY_PLATFORM =~ /mswin/
-#         sh %{rake --trace #{target.to_s} }
+#         sh("rake #{target.to_s}") # --trace 
 #       end
 #     end
 #   end
@@ -185,8 +186,8 @@ end
 #   sub_project("mongrel_status", :install)
 #   sub_project("mongrel_upload_progress", :install)
 #   sub_project("mongrel_console", :install)
-#   sub_project("mongrel_cluster", :install)  
-#   sub_project("mongrel_experimental", :install)
+#   sub_project("mongrel_cluster", :install)
+#   # sub_project("mongrel_experimental", :install)
 #   sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
 # end
 # 
@@ -197,8 +198,8 @@ end
 #   sub_project("mongrel_upload_progress", :uninstall)
 #   sub_project("mongrel_console", :uninstall)
 #   sub_project("gem_plugin", :uninstall)
-#   sub_project("fastthread", :uninstall)  
-#   sub_project("mongrel_experimental", :uninstall)  
+#   sub_project("fastthread", :uninstall)
+#   # sub_project("mongrel_experimental", :uninstall)
 #   sub_project("mongrel_service", :uninstall) if RUBY_PLATFORM =~ /mswin/
 # end
 # 
@@ -210,8 +211,8 @@ end
 #   sub_project("mongrel_status", :clean)
 #   sub_project("mongrel_upload_progress", :clean)
 #   sub_project("mongrel_console", :clean)
-#   sub_project("mongrel_cluster", :clean) 
-#   sub_project("mongrel_experimental", :clean)    
+#   sub_project("mongrel_cluster", :clean)
+#   sub_project("mongrel_experimental", :clean)
 #   sub_project("mongrel_service", :clean) if RUBY_PLATFORM =~ /mswin/
 # end
 # 
@@ -225,39 +226,39 @@ end
 #     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-#{e.version}-mswin32.gem pkg/gems/"
-#     sh "cp ~/Downloads/mongrel_service-0.3.3-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 "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"  
+#     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; webgen; ruby atom.rb > output/feed.atom; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/"
+#     # Requires the 'webgem' gem
+#     sh "cd site; webgen; webgen; curl 'http://feed43.com/mongrel.xml' > output/rss.xml; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/"
 #   end
-#   
+# 
 #   desc "Upload the rdocs"
 #   task :rdoc => [:doc] do
 #     sh "rsync -azv --no-perms --no-times doc/* rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/"
 #     sh "cd projects/gem_plugin; rake site:rdoc"
 #   end
-#   
+# 
 #   desc "Upload the coverage report"
 #   task :coverage => [:rcov] do
 #     sh "rsync -azv --no-perms --no-times test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/" rescue nil
 #   end
-#   
+# 
 #   desc "Upload the website, the rdocs, and the coverage report"
 #   task :all => [:clean, :web, :rdoc, :coverage]
-#   
+# 
 # end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2007-11-01 00:00:00 -04:00
+  version: 1.1.1
+date: 2007-11-12 00:00:00 -05:00
 summary: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 require_paths: 
 - lib