From 1db9a8243d42cc86d5ca4901bceb305061d0d212 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 27 Jun 2015 02:47:35 +0000 Subject: apply TCP socket options on inherited sockets TCP socket options are now set when inheriting existing sockets from a parent process. I'm fairly certain all the TCP setsockopt knobs we use are idempotent and harmless to change. If anything, the only directive I'd be uncomfortable changing is shortening the listen(2) (aka :backlog) size, but we've always changed that anyways since it also applies to UNIX sockets. Note: removing a configuration knob in a unicorn config file can not reset the value to the OS-provided default setting. Inherited sockets must use a new setting to override existing ones. (or the socket needs to be closed and re-created in the process launcher before unicorn inherits it). Noticed-by: Christos Trochalakis <20150626114129.GA25883@luke.ws.skroutz.gr> --- lib/unicorn/http_server.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 3282ec7..297b9f9 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -768,10 +768,11 @@ class Unicorn::HttpServer # before they become Kgio::UNIXServer or Kgio::TCPServer inherited = ENV['UNICORN_FD'].to_s.split(',').map do |fd| io = Socket.for_fd(fd.to_i) - set_server_sockopt(io, listener_opts[sock_name(io)]) io.autoclose = false + io = server_cast(io) + set_server_sockopt(io, listener_opts[sock_name(io)]) logger.info "inherited addr=#{sock_name(io)} fd=#{fd}" - server_cast(io) + io end config_listeners = config[:listeners].dup -- cgit v1.2.3-24-ge0c7