kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

close #15539

Browse source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@877 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
evanweaver 2007-11-12 21:13:03 +00:00
parent 2d38b5d25b
commit c97a9e8bb3
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/mongrel_rails
View file

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

1
lib/mongrel.rb
View file

@ -9,7 +9,6 @@ require 'stringio'
require 'mongrel/gems' require 'mongrel/gems'
Mongrel::Gems.require 'gem_plugin'
Mongrel::Gems.require 'cgi_multipart_eof_fix' Mongrel::Gems.require 'cgi_multipart_eof_fix'
Mongrel::Gems.require 'fastthread' Mongrel::Gems.require 'fastthread'
require 'thread' require 'thread'

2
lib/mongrel/const.rb
View file

@ -65,7 +65,7 @@ module Mongrel
REQUEST_URI='REQUEST_URI'.freeze REQUEST_URI='REQUEST_URI'.freeze
REQUEST_PATH='REQUEST_PATH'.freeze REQUEST_PATH='REQUEST_PATH'.freeze
MONGREL_VERSION="1.1".freeze MONGREL_VERSION="1.1.1".freeze
MONGREL_TMP_BASE="mongrel".freeze MONGREL_TMP_BASE="mongrel".freeze

11
lib/mongrel/gems.rb
View file

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