Changeset 877

Show
Ignore:
Timestamp:
11/12/07 16:13:03 (10 months ago)
Author:
evanweaver
Message:

close #15539

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bin/mongrel_rails

    r865 r877  
    1111require 'mongrel' 
    1212require 'mongrel/rails' 
     13 
     14Mongrel::Gems.require 'gem_plugin' 
    1315 
    1416# require 'ruby-debug' 

  • trunk/lib/mongrel.rb

    r876 r877  
    1010require 'mongrel/gems' 
    1111 
    12 Mongrel::Gems.require 'gem_plugin' 
    1312Mongrel::Gems.require 'cgi_multipart_eof_fix' 
    1413Mongrel::Gems.require 'fastthread' 

  • trunk/lib/mongrel/const.rb

    r814 r877  
    6666    REQUEST_PATH='REQUEST_PATH'.freeze 
    6767 
    68     MONGREL_VERSION="1.1".freeze 
     68    MONGREL_VERSION="1.1.1".freeze 
    6969 
    7070    MONGREL_TMP_BASE="mongrel".freeze 

  • trunk/lib/mongrel/gems.rb

    r865 r877  
    33    class << self 
    44     
    5       alias :original_require :require 
    6      
    75      def require(library, version = nil) 
    86        begin 
    9           original_require library 
     7          Kernel.require library 
    108        rescue LoadError, RuntimeError => e 
    11           unless respond_to? 'gem' 
     9          begin  
    1210            # ActiveSupport breaks 'require' by making it always return a true value 
    1311            require 'rubygems' 
    14             gem library, version if version 
    15             retry  
     12            version ? gem(library, version) : gem(library) 
     13            retry 
     14          rescue Gem::LoadError, LoadError, RuntimeError 
     15            # puts "** #{library.inspect} could not be loaded" unless library == "mongrel_experimental" 
    1616          end 
    17           # Fail without reraising 
    1817        end   
    1918      end