about summary refs log tree commit homepage
path: root/lib/mongrel.rb
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-30 07:29:09 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-30 07:29:09 +0000
commit2fe13844e372c04126390c3dcbc85b8c92fc264a (patch)
tree4034676c03d80b81abe71a496ab46d7184db8cd3 /lib/mongrel.rb
parent6c8096aedbcbf8980c3430923d7f19afcf0d65bc (diff)
downloadunicorn-2fe13844e372c04126390c3dcbc85b8c92fc264a.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@846 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel.rb')
-rw-r--r--lib/mongrel.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 5389fab..2559eac 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -348,7 +348,15 @@ end
 # in regular Mongrel.
 
 begin  
-  gem 'mongrel_experimental', '=1.1' if respond_to? 'gem'
+  # Look for SVN version
+  $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/'
   require 'mongrel_experimental'  
 rescue LoadError
+  begin
+    # Look for gem
+    gem 'mongrel_experimental', '=1.1' if respond_to? 'gem'
+    require 'mongrel_experimental'  
+  rescue LoadError
+    # Not found
+  end
 end