close #15539

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

2 files changed, 7 insertions, 8 deletions

diff --git a/lib/mongrel/const.rb b/lib/mongrel/const.rb
index f714b67..6c6742b 100644
--- a/lib/mongrel/const.rb
+++ b/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
 
diff --git a/lib/mongrel/gems.rb b/lib/mongrel/gems.rb
index 4b34552..c1264bb 100644
--- a/lib/mongrel/gems.rb
+++ b/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