mongrel 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v1.1.2. Fix worker termination bug; fix JRuby 1.0.3 load order issue; fix require issue on systems without Rubygems.
+
 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.

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.1"); /* XXX Why is this defined here? */
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.1.2"); /* XXX Why is this defined here? */
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

data/ext/http11_java/org/jruby/mongrel/Http11.java

@@ -215,7 +215,7 @@ public class Http11 extends RubyObject {
 
                 req.setInstanceVariable("@http_body", RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length)));
                 req.aset(runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
-                req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.0.1"));
+                req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.2"));
             }
         };
 

data/lib/mongrel.rb

@@ -1,4 +1,5 @@
 
+# Standard libraries
 require 'socket'
 require 'tempfile'
 require 'yaml'
@@ -7,13 +8,16 @@ require 'etc'
 require 'uri'
 require 'stringio'
 
-require 'mongrel/gems'
+# Compiled Mongrel extension
+require 'http11'
 
+# Gem conditional loader
+require 'mongrel/gems'
 Mongrel::Gems.require 'cgi_multipart_eof_fix'
 Mongrel::Gems.require 'fastthread'
 require 'thread'
 
-require 'http11'
+# Ruby Mongrel
 require 'mongrel/cgi'
 require 'mongrel/handlers'
 require 'mongrel/command'
@@ -213,7 +217,7 @@ module Mongrel
           worker[:started_on] = Time.now if not worker[:started_on]
 
           if mark - worker[:started_on] > @timeout + @throttle
-            STDERR.puts "Thread #{w.inspect} is too old, killing."
+            STDERR.puts "Thread #{worker.inspect} is too old, killing."
             worker.raise(TimeoutError.new(error_msg))
           end
         end

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

data/lib/mongrel/gems.rb

@@ -8,7 +8,7 @@ module Mongrel
         rescue LoadError, RuntimeError => e
           begin 
             # ActiveSupport breaks 'require' by making it always return a true value
-            require 'rubygems'
+            Kernel.require 'rubygems'
             version ? gem(library, version) : gem(library)
             retry
           rescue Gem::LoadError, LoadError, RuntimeError

data/mongrel.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Mongrel-1.1.1
+# Gem::Specification for Mongrel-1.1.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{mongrel}
-  s.version = "1.1.1"
+  s.version = "1.1.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-11-12}
+  s.date = %q{2007-12-15}
   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{}
@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{0.9.5}
   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"])
+  s.add_dependency(%q<cgi_multipart_eof_fix>, [">= 2.4"])
 end
 
 
@@ -36,7 +36,7 @@ end
 # 
 # 
 # require 'rubygems'
-# gem 'echoe', '>=2.7'
+# gem 'echoe', '>=2.7.5'
 # require 'echoe'
 # 
 # e = Echoe.new("mongrel") do |p|
@@ -46,30 +46,32 @@ end
 #   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.dependencies = ['gem_plugin >=0.2.3']  
+#   p.extension_pattern = nil
+#   
 #   p.need_tar_gz = false
 #   p.need_tgz = true
 # 
-#   #  case RUBY_PLATFORM
-#   #  when /mswin/
-#   #  else
-#   #  end
+#   case RUBY_PLATFORM
+#     when /mswin/
+#     when /java/
+#     else
+#       p.extension_pattern = ["ext/**/extconf.rb"]
+#   end
 # 
 #   p.eval = proc do
 #     case RUBY_PLATFORM
 #     when /mswin/
-#       extensions.clear
 #       self.files += ['lib/http11.so']
 #       self.platform = Gem::Platform::WIN32
+#       add_dependency('cgi_multipart_eof_fix', '>= 2.4')
 #     when /java/
-#       extensions.clear
 #       self.files += ['lib/http11.jar']
 #       self.platform = 'jruby'
 #     else
 #       add_dependency('daemons', '>= 1.0.3')
 #       add_dependency('fastthread', '>= 1.0.1')
+#       add_dependency('cgi_multipart_eof_fix', '>= 2.4')
 #     end
 #   end
 # 
@@ -93,16 +95,7 @@ end
 #   end
 # end
 # 
-# #### XXX Hack around JRuby test/unit interaction problems
-# 
-# desc "Run each test suite in isolation on JRuby"
-# task :test_java do
-#   e.test_pattern.each do |f|
-#     sh "/opt/local/jruby/bin/jruby -w -Ilib:ext:bin:test -e 'require \"#{f}\"'" rescue nil
-#   end
-# end
-# 
-# #### XXX Hack around RubyGems and Echoe for pre-compiled extensions.
+# #### Pre-compiled extensions for alternative platforms
 # 
 # def move_extensions
 #   Dir["ext/**/*.#{Config::CONFIG['DLEXT']}"].each { |file| mv file, "lib/" }
@@ -133,6 +126,14 @@ end
 #   task :compile => [filename]
 # 
 # when /java/
+# 
+#   # Avoid JRuby in-process launching problem
+#   begin
+#     require 'jruby'
+#     JRuby.runtime.instance_config.run_ruby_in_process = false 
+#   rescue LoadError
+#   end
+# 
 #   filename = "lib/http11.jar"
 #   file filename do
 #     build_dir = "ext/http11_java/classes"
@@ -168,8 +169,11 @@ end
 #   sub_project("mongrel_console", :package)
 #   sub_project("mongrel_cluster", :package)
 #   sub_project("mongrel_experimental", :package)
-#   sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/
+# 
 #   sh("rake java package") unless RUBY_PLATFORM =~ /java/
+#   
+#   # XXX Broken by RubyGems 0.9.5
+#   # sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/
 #   # sh("rake mswin package") unless RUBY_PLATFORM =~ /mswin/
 # end
 # 
@@ -230,9 +234,6 @@ end
 #     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 "rm -rf pkg/mongrel*"
 #     sh "gem generate_index -d pkg"
 #     sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"
@@ -245,6 +246,7 @@ end
 #   task :web do
 #     # 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/"
+#     puts "\nMake sure to re-run the site update 6 hours later if you updated the news. This delay is required for Feed43 to pick up the site changes."
 #   end
 # 
 #   desc "Upload the rdocs"

metadata

@@ -1,36 +1,12 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.6
-specification_version: 2
 name: mongrel
 version: !ruby/object:Gem::Version 
-  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
-- ext
-email: ""
-homepage: ""
-rubyforge_project: mongrel
-description: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
+  version: 1.1.2
+platform: ruby
+authors: 
+- Zed A. Shaw
 autorequire: 
-default_executable: 
 bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-platform: ruby
-signing_key: 
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
@@ -76,9 +52,53 @@ cert_chain:
   ALN3mi/9z0Mf1YroliUgF0v5Yw==
   -----END CERTIFICATE-----
 
-post_install_message: 
-authors: 
-- Zed A. Shaw
+date: 2007-12-15 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: gem_plugin
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fastthread
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cgi_multipart_eof_fix
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.4"
+    version: 
+description: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
+email: ""
+executables: 
+- mongrel_rails
+extensions: 
+- ext/http11/extconf.rb
+extra_rdoc_files: []
+
 files: 
 - bin/mongrel_rails
 - CHANGELOG
@@ -149,6 +169,33 @@ files:
 - test/testhelp.rb
 - TODO
 - tools/trickletest.rb
+has_rdoc: true
+homepage: ""
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.4
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: mongrel
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 test_files: 
 - test/test_cgi_wrapper.rb
 - test/test_command.rb
@@ -163,50 +210,3 @@ test_files:
 - test/test_stats.rb
 - test/test_uriclassifier.rb
 - test/test_ws.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: 
-- mongrel_rails
-extensions: 
-- ext/http11/extconf.rb
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: gem_plugin
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cgi_multipart_eof_fix
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.4"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fastthread
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: