require cgi_multipart in mongrel itself, not mongrel_rails; bump required version in gemspec

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@548 19e92222-5c0b-0410-8929-a290d50e31e9

3 files changed, 8 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index f34fffc..67e57ce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,7 +75,7 @@ setup_gem(name, version) do |spec|
   end
   
   spec.add_dependency('gem_plugin', '>= 0.2.2')
-  spec.add_dependency('cgi_multipart_eof_fix', '>= 1.0.0')
+  spec.add_dependency('cgi_multipart_eof_fix', '>= 2')
 end
 
 task :install do
diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index 506c8cf..edcba12 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -9,7 +9,6 @@ require 'yaml'
 require 'mongrel'
 require 'mongrel/rails'
 require 'etc'
-require 'cgi_multipart_eof_fix' rescue nil
 
 module Mongrel
   class Start < GemPlugin::Plugin "/commands"
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 2ecc8ac..97833dc 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -10,6 +10,7 @@ require 'rubygems'
 require 'socket'
 require 'http11'
 require 'tempfile'
+
 begin
   require 'fastthread'
 rescue RuntimeError => e
@@ -18,6 +19,12 @@ rescue LoadError
 ensure
   require 'thread'
 end
+
+begin
+  require 'cgi_multipart_eof_fix'
+rescue LoadError
+end
+
 require 'stringio'
 require 'mongrel/cgi'
 require 'mongrel/handlers'