diff --git a/CHANGELOG b/CHANGELOG index c52a9721..a62d2533 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +== 1.2.7 No Hup + * Do not trap unsupported HUP signal on Windows + == 1.2.6 Crazy Delicious * Make work with Rails 3 out-of-the-box. * Auto-detect and load config.ru files on start. Makes Rails 3 work. diff --git a/lib/thin/server.rb b/lib/thin/server.rb index c448959e..52b55ae9 100644 --- a/lib/thin/server.rb +++ b/lib/thin/server.rb @@ -210,10 +210,12 @@ def running? # * INT calls +stop+ to shutdown gracefully. # * TERM calls stop! to force shutdown. def setup_signals - trap('QUIT') { stop } unless Thin.win? trap('INT') { stop! } trap('TERM') { stop! } - trap('HUP') { restart } + unless Thin.win? + trap('QUIT') { stop } + trap('HUP') { restart } + end end def select_backend(host, port, options) diff --git a/lib/thin/version.rb b/lib/thin/version.rb index 9935d195..22261afa 100644 --- a/lib/thin/version.rb +++ b/lib/thin/version.rb @@ -6,11 +6,11 @@ class PlatformNotSupported < RuntimeError; end module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].join('.') - CODENAME = "Crazy Delicious".freeze + CODENAME = "No Hup".freeze RACK = [1, 0].freeze # Rack protocol version end