diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unicorn/configurator.rb | 2 | ||||
| -rw-r--r-- | lib/unicorn/http_server.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index d14e608..69b4644 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -306,8 +306,6 @@ class Unicorn::Configurator # to receive IPv4 queries on dual-stack systems. A separate IPv4-only # listener is required if this is true. # - # This option is only available for Ruby 1.9.2 and later. - # # Enabling this option for the IPv6-only listener and having a # separate IPv4 listener is recommended if you wish to support IPv6 # on the same TCP port. Otherwise, the value of \env[\"REMOTE_ADDR\"] diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 95a8ffe..895f56d 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -67,7 +67,7 @@ class Unicorn::HttpServer # you can set the following in your Unicorn config file, HUP and then # continue with the traditional USR2 + QUIT upgrade steps: # - # Unicorn::HttpServer::START_CTX[0] = "/home/bofh/1.9.2/bin/unicorn" + # Unicorn::HttpServer::START_CTX[0] = "/home/bofh/2.2.0/bin/unicorn" START_CTX = { :argv => ARGV.map { |arg| arg.dup }, 0 => $0.dup, @@ -453,7 +453,7 @@ class Unicorn::HttpServer # exec(command, hash) works in at least 1.9.1+, but will only be # required in 1.9.4/2.0.0 at earliest. - cmd << listener_fds if RUBY_VERSION >= "1.9.1" + cmd << listener_fds logger.info "executing #{cmd.inspect} (in #{Dir.pwd})" before_exec.call(self) exec(*cmd) |