From bda137d7be08bdac5d4fa361a4c4649dc10e457f Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 15 Nov 2009 14:57:49 -0800
Subject: Revert "Threaded models have trouble with late loading under 1.9"

This reverts commit e1dcadef6ca242e36e99aab19e3e040bf01070f9.

This is fixed separately in Unicorn 0.95.0 (commit
560216c2fecfc5cf3489f749dc7a0221fd78eb26)
---
 lib/rainbows/http_server.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib/rainbows/http_server.rb')

diff --git a/lib/rainbows/http_server.rb b/lib/rainbows/http_server.rb
index a1ec4f6..c26285c 100644
--- a/lib/rainbows/http_server.rb
+++ b/lib/rainbows/http_server.rb
@@ -53,13 +53,7 @@ module Rainbows
         raise ArgumentError, "concurrency model #{model.inspect} not supported"
       extend(mod)
       Const::RACK_DEFAULTS['rainbows.model'] = @use = model.to_sym
-
-      if /Thread/ =~ model.to_s
-        Const::RACK_DEFAULTS['rack.multithread'] = true
-        # autoload/require is not thread-safe
-        Unicorn.constants.each { |x| Unicorn.const_get(x) }
-      end
-
+      Const::RACK_DEFAULTS['rack.multithread'] = !!(/Thread/ =~ model.to_s)
       case @use
       when :Rev, :EventMachine
         Const::RACK_DEFAULTS['rainbows.autochunk'] = true
-- 
cgit v1.2.3-24-ge0c7