diff options
author | Eric Wong <e@80x24.org> | 2015-02-06 20:09:19 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2015-04-22 18:56:42 +0000 |
commit | c3271c2eb26578316d7cecad1a2b99e1814a5fa3 (patch) | |
tree | 45bedb64a441f47c84a5b2fc478007be81480173 /lib | |
parent | e5925e55a5365053415f08bb4cb7f810a533601d (diff) | |
download | unicorn-c3271c2eb26578316d7cecad1a2b99e1814a5fa3.tar.gz |
unicorn 5 will not support Ruby 1.8 anymore. Drop mentions of Rubinius, too, it's too difficult to support due to the proprietary and registration-required nature of its bug tracker. The smaller memory footprint and CoW-friendly memory allocator in mainline Ruby is a better fit for unicorn, anyways. Since Ruby 1.9+ bundles RubyGems and gem startup is faster nowadays, we'll just depend on that instead of not loading RubyGems. Drop the local.mk.sample file, too, since it's way out-of-date and probably isn't useful (I have not used it in a while). [reinstate 1.9 version check for listener_fds in backport]
Diffstat (limited to 'lib')
-rw-r--r-- | lib/unicorn/configurator.rb | 2 | ||||
-rw-r--r-- | lib/unicorn/http_server.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 9406223..0658c81 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -309,8 +309,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 a0ca302..509fb36 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -69,7 +69,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, |