From 1b1d758124a0f30e0a331716e6684973ca2bc94b Mon Sep 17 00:00:00 2001 From: evanweaver Date: Fri, 26 Oct 2007 09:04:18 +0000 Subject: i think mutex_fix is not used due to fastthread git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@765 19e92222-5c0b-0410-8929-a290d50e31e9 --- lib/mongrel.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'lib/mongrel.rb') diff --git a/lib/mongrel.rb b/lib/mongrel.rb index d5ac6f8..4c02a88 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -1,12 +1,12 @@ -# Copyright (c) 2005 Zed A. Shaw -# You can redistribute it and/or modify it under the same terms as Ruby. -# -# Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html -# for more information. require 'socket' require 'http11' require 'tempfile' +require 'yaml' +require 'time' +require 'etc' +require 'uri' +require 'stringio' begin require 'fastthread' @@ -19,17 +19,11 @@ end require 'cgi_multipart_eof_fix' -require 'stringio' require 'mongrel/cgi' require 'mongrel/handlers' require 'mongrel/command' require 'mongrel/tcphack' -require 'yaml' require 'mongrel/configurator' -require 'time' -require 'etc' -require 'uri' - # Mongrel module containing all of the classes (include C extensions) for running # a Mongrel web server. It contains a minimalist HTTP server with just enough @@ -871,3 +865,11 @@ module Mongrel end end + +# Load experimental gem, if present. We put it here so it can override anything +# in regular Mongrel. + +begin + require 'mongrel_experimental', '=1.1' +rescue LoadError +end -- cgit v1.2.3-24-ge0c7