Changeset 852
- Timestamp:
- 10/31/07 18:32:32 (1 year ago)
- Files:
-
- trunk/Manifest (modified) (2 diffs)
- trunk/lib/mongrel.rb (modified) (3 diffs)
- trunk/lib/mongrel/command.rb (modified) (1 diff)
- trunk/lib/mongrel/init.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Manifest
r787 r852 23 23 ext/http11/http11_parser.rl 24 24 ext/http11/http11_parser_common.rl 25 ext/http11/MANIFEST26 25 ext/http11_java/Http11Service.java 27 26 ext/http11_java/org/jruby/mongrel/Http11.java … … 33 32 lib/mongrel/const.rb 34 33 lib/mongrel/debug.rb 34 lib/mongrel/gems.rb 35 35 lib/mongrel/handlers.rb 36 36 lib/mongrel/header_out.rb trunk/lib/mongrel.rb
r846 r852 1 1 2 2 require 'socket' 3 require 'http11'4 3 require 'tempfile' 5 4 require 'yaml' … … 9 8 require 'stringio' 10 9 11 begin 12 require 'fastthread' 13 rescue LoadError, RuntimeError 14 require 'rubygems' and retry 15 ensure 16 require 'thread' 17 end 18 19 begin 20 require 'cgi_multipart_eof_fix' 21 rescue LoadError 22 require 'rubygems' and retry 23 end 24 10 require 'mongrel/gems' 11 12 Mongrel::Gems.require 'cgi_multipart_eof_fix' 13 Mongrel::Gems.require 'fastthread' 14 require 'thread' 15 16 require 'http11' 25 17 require 'mongrel/cgi' 26 18 require 'mongrel/handlers' … … 348 340 # in regular Mongrel. 349 341 350 begin 351 # Look for SVN version 352 $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' 353 require 'mongrel_experimental' 354 rescue LoadError 355 begin 356 # Look for gem 357 gem 'mongrel_experimental', '=1.1' if respond_to? 'gem' 358 require 'mongrel_experimental' 359 rescue LoadError 360 # Not found 361 end 362 end 342 $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' 343 Mongrel::Gems.require 'mongrel_experimental', '=1.1' trunk/lib/mongrel/command.rb
r808 r852 8 8 require 'optparse' 9 9 10 begin 11 require 'gem_plugin' 12 rescue LoadError 13 require 'rubygems' and retry 14 end 10 require 'mongrel/gems' 11 Mongrel::Gems.require 'gem_plugin' 15 12 16 13 module Mongrel trunk/lib/mongrel/init.rb
r808 r852 5 5 # for more information. 6 6 7 begin 8 require 'gem_plugin' 9 rescue LoadError 10 require 'rubygems' and retry 11 end 7 require 'mongrel/gems' 8 Mongrel::Gems.require 'gem_plugin' 12 9 13 10 # File is just a stub that makes sure the mongrel_plugins gem is loaded and ready 14 15 16
