diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-06-29 07:19:32 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-06-29 07:19:32 +0000 |
commit | 19f798301ac1884f423640efafb277b071bb5439 (patch) | |
tree | 472c4e62378be7295d903f76dd3535cbaafe4b51 /lib/unicorn | |
parent | 38672501206c9e64d241e3d8571f70b198f0c1e5 (diff) | |
download | unicorn-19f798301ac1884f423640efafb277b071bb5439.tar.gz |
The testcase for this was broken, too, so we didn't notice this :< Reported-by: ghazel@gmail.com on the Rainbows! mailing list, http://mid.gmane.org/BANLkTi=oQXK5Casq9SuGD3edeUrDPvRm3A@mail.gmail.com
Diffstat (limited to 'lib/unicorn')
-rw-r--r-- | lib/unicorn/http_server.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 02ba965..78d80b4 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -453,7 +453,7 @@ class Unicorn::HttpServer def after_fork_internal @ready_pipe.close if @ready_pipe Unicorn::Configurator::RACKUP.clear - @ready_pipe = @init_listeners = @config = @before_exec = @before_fork = nil + @ready_pipe = @init_listeners = @before_exec = @before_fork = nil srand # http://redmine.ruby-lang.org/issues/4338 @@ -545,6 +545,7 @@ class Unicorn::HttpServer after_fork.call(self, worker) # can drop perms worker.user(*user) if user.kind_of?(Array) && ! worker.switched self.timeout /= 2.0 # halve it for select() + @config = nil build_app! unless preload_app end |