unicorn 5.5.1 → 6.0.0

data/ext/unicorn_http/unicorn_http.rl

@@ -62,7 +62,8 @@ struct http_parser {
   } len;
 };
 
-static ID id_set_backtrace;
+static ID id_set_backtrace, id_is_chunked_p;
+static VALUE cHttpParser;
 
 #ifdef HAVE_RB_HASH_CLEAR /* Ruby >= 2.0 */
 #  define my_hash_clear(h) (void)rb_hash_clear(h)
@@ -220,6 +221,19 @@ static void write_cont_value(struct http_parser *hp,
   rb_str_buf_cat(hp->cont, vptr, end + 1);
 }
 
+static int is_chunked(VALUE v)
+{
+  /* common case first */
+  if (STR_CSTR_CASE_EQ(v, "chunked"))
+    return 1;
+
+  /*
+   * call Ruby function in unicorn/http_request.rb to deal with unlikely
+   * comma-delimited case
+   */
+  return rb_funcall(cHttpParser, id_is_chunked_p, 1, v) != Qfalse;
+}
+
 static void write_value(struct http_parser *hp,
                         const char *buffer, const char *p)
 {
@@ -246,7 +260,9 @@ static void write_value(struct http_parser *hp,
     f = uncommon_field(field, flen);
   } else if (f == g_http_connection) {
     hp_keepalive_connection(hp, v);
-  } else if (f == g_content_length) {
+  } else if (f == g_content_length && !HP_FL_TEST(hp, CHUNKED)) {
+    if (hp->len.content)
+      parser_raise(eHttpParserError, "Content-Length already set");
     hp->len.content = parse_length(RSTRING_PTR(v), RSTRING_LEN(v));
     if (hp->len.content < 0)
       parser_raise(eHttpParserError, "invalid Content-Length");
@@ -254,9 +270,30 @@ static void write_value(struct http_parser *hp,
       HP_FL_SET(hp, HASBODY);
     hp_invalid_if_trailer(hp);
   } else if (f == g_http_transfer_encoding) {
-    if (STR_CSTR_CASE_EQ(v, "chunked")) {
+    if (is_chunked(v)) {
+      if (HP_FL_TEST(hp, CHUNKED))
+        /*
+         * RFC 7230 3.3.1:
+         * A sender MUST NOT apply chunked more than once to a message body
+         * (i.e., chunking an already chunked message is not allowed).
+         */
+        parser_raise(eHttpParserError, "Transfer-Encoding double chunked");
+
       HP_FL_SET(hp, CHUNKED);
       HP_FL_SET(hp, HASBODY);
+
+      /* RFC 7230 3.3.3, 3: favor chunked if Content-Length exists */
+      hp->len.content = 0;
+    } else if (HP_FL_TEST(hp, CHUNKED)) {
+      /*
+       * RFC 7230 3.3.3, point 3 states:
+       * If a Transfer-Encoding header field is present in a request and
+       * the chunked transfer coding is not the final encoding, the
+       * message body length cannot be determined reliably; the server
+       * MUST respond with the 400 (Bad Request) status code and then
+       * close the connection.
+       */
+      parser_raise(eHttpParserError, "invalid Transfer-Encoding");
     }
     hp_invalid_if_trailer(hp);
   } else if (f == g_http_trailer) {
@@ -487,7 +524,7 @@ static void set_url_scheme(VALUE env, VALUE *server_port)
      * and X-Forwarded-Proto handling from this parser?  We've had it
      * forever and nobody has said anything against it, either.
      * Anyways, please send comments to our public mailing list:
-     * unicorn-public@bogomips.org (no HTML mail, no subscription necessary)
+     * unicorn-public@yhbt.net (no HTML mail, no subscription necessary)
      */
     scheme = rb_hash_aref(env, g_http_x_forwarded_ssl);
     if (!NIL_P(scheme) && STR_CSTR_EQ(scheme, "on")) {
@@ -931,7 +968,7 @@ static VALUE HttpParser_rssget(VALUE self)
 
 void Init_unicorn_http(void)
 {
-  VALUE mUnicorn, cHttpParser;
+  VALUE mUnicorn;
 
   mUnicorn = rb_define_module("Unicorn");
   cHttpParser = rb_define_class_under(mUnicorn, "HttpParser", rb_cObject);
@@ -991,5 +1028,6 @@ void Init_unicorn_http(void)
 #ifndef HAVE_RB_HASH_CLEAR
   id_clear = rb_intern("clear");
 #endif
+  id_is_chunked_p = rb_intern("is_chunked?");
 }
 #undef SET_GLOBAL

data/lib/unicorn/configurator.rb

@@ -3,11 +3,11 @@ require 'logger'
 
 # Implements a simple DSL for configuring a unicorn server.
 #
-# See https://bogomips.org/unicorn/examples/unicorn.conf.rb and
-# https://bogomips.org/unicorn/examples/unicorn.conf.minimal.rb
+# See https://yhbt.net/unicorn/examples/unicorn.conf.rb and
+# https://yhbt.net/unicorn/examples/unicorn.conf.minimal.rb
 # example configuration files.  An example config file for use with
 # nginx is also available at
-# https://bogomips.org/unicorn/examples/nginx.conf
+# https://yhbt.net/unicorn/examples/nginx.conf
 #
 # See the link:/TUNING.html document for more information on tuning unicorn.
 class Unicorn::Configurator
@@ -53,6 +53,7 @@ class Unicorn::Configurator
         server.logger.info("worker=#{worker.nr} ready")
       },
     :pid => nil,
+    :early_hints => false,
     :worker_exec => false,
     :preload_app => false,
     :check_client_connection => false,
@@ -276,6 +277,15 @@ class Unicorn::Configurator
     set_bool(:default_middleware, bool)
   end
 
+  # sets whether to enable the proposed early hints Rack API.
+  # If enabled, Rails 5.2+ will automatically send a 103 Early Hint
+  # for all the `javascript_include_tag` and `stylesheet_link_tag`
+  # in your response. See: https://api.rubyonrails.org/v5.2/classes/ActionDispatch/Request.html#method-i-send_early_hints
+  # See also https://tools.ietf.org/html/rfc8297
+  def early_hints(bool)
+    set_bool(:early_hints, bool)
+  end
+
   # sets listeners to the given +addresses+, replacing or augmenting the
   # current set.  This is for the global listener pool shared by all
   # worker processes.  For per-worker listeners, see the after_fork example

data/lib/unicorn/http_request.rb

@@ -62,7 +62,6 @@ class Unicorn::HttpParser
   # This does minimal exception trapping and it is up to the caller
   # to handle any socket errors (e.g. user aborted upload).
   def read(socket)
-    clear
     e = env
 
     # From https://www.ietf.org/rfc/rfc3875:
@@ -188,4 +187,15 @@ class Unicorn::HttpParser
       HTTP_RESPONSE_START.each { |c| socket.write(c) }
     end
   end
+
+  # called by ext/unicorn_http/unicorn_http.rl via rb_funcall
+  def self.is_chunked?(v) # :nodoc:
+    vals = v.split(/[ \t]*,[ \t]*/).map!(&:downcase)
+    if vals.pop == 'chunked'.freeze
+      return true unless vals.include?('chunked'.freeze)
+      raise Unicorn::HttpParserError, 'double chunked', []
+    end
+    return false unless vals.include?('chunked'.freeze)
+    raise Unicorn::HttpParserError, 'chunked not last', []
+  end
 end

data/lib/unicorn/http_server.rb

@@ -6,7 +6,7 @@
 # forked worker children.
 #
 # Users do not need to know the internals of this class, but reading the
-# {source}[https://bogomips.org/unicorn.git/tree/lib/unicorn/http_server.rb]
+# {source}[https://yhbt.net/unicorn.git/tree/lib/unicorn/http_server.rb]
 # is education for programmers wishing to learn how unicorn works.
 # See Unicorn::Configurator for information on how to configure unicorn.
 class Unicorn::HttpServer
@@ -15,7 +15,7 @@ class Unicorn::HttpServer
                 :before_fork, :after_fork, :before_exec,
                 :listener_opts, :preload_app,
                 :orig_app, :config, :ready_pipe, :user,
-                :default_middleware
+                :default_middleware, :early_hints
   attr_writer   :after_worker_exit, :after_worker_ready, :worker_exec
 
   attr_reader :pid, :logger
@@ -69,7 +69,6 @@ class Unicorn::HttpServer
   # incoming requests on the socket.
   def initialize(app, options = {})
     @app = app
-    @request = Unicorn::HttpRequest.new
     @reexec_pid = 0
     @default_middleware = true
     options = options.dup
@@ -588,6 +587,25 @@ class Unicorn::HttpServer
   rescue
   end
 
+  def e103_response_write(client, headers)
+    response = if @request.response_start_sent
+      "103 Early Hints\r\n"
+    else
+      "HTTP/1.1 103 Early Hints\r\n"
+    end
+
+    headers.each_pair do |k, vs|
+      next if !vs || vs.empty?
+      values = vs.to_s.split("\n".freeze)
+      values.each do |v|
+        response << "#{k}: #{v}\r\n"
+      end
+    end
+    response << "\r\n".freeze
+    response << "HTTP/1.1 ".freeze if @request.response_start_sent
+    client.write(response)
+  end
+
   def e100_response_write(client, env)
     # We use String#freeze to avoid allocations under Ruby 2.1+
     # Not many users hit this code path, so it's better to reduce the
@@ -602,7 +620,18 @@ class Unicorn::HttpServer
   # once a client is accepted, it is processed in its entirety here
   # in 3 easy steps: read request, call app, write app response
   def process_client(client)
-    status, headers, body = @app.call(env = @request.read(client))
+    @request = Unicorn::HttpRequest.new
+    env = @request.read(client)
+
+    if early_hints
+      env["rack.early_hints"] = lambda do |headers|
+        e103_response_write(client, headers)
+      end
+    end
+
+    env["rack.after_reply"] = []
+
+    status, headers, body = @app.call(env)
 
     begin
       return if @request.hijacked?
@@ -624,6 +653,8 @@ class Unicorn::HttpServer
     end
   rescue => e
     handle_error(client, e)
+  ensure
+    env["rack.after_reply"].each(&:call) if env
   end
 
   def nuke_listeners!(readers)
@@ -686,6 +717,7 @@ class Unicorn::HttpServer
     trap(:USR1) { nr = -65536 }
 
     ready = readers.dup
+    nr_listeners = readers.size
     @after_worker_ready.call(self, worker)
 
     begin
@@ -708,7 +740,7 @@ class Unicorn::HttpServer
       # we're probably reasonably busy, so avoid calling select()
       # and do a speculative non-blocking accept() on ready listeners
       # before we sleep again in select().
-      unless nr == 0
+      if nr == nr_listeners
         tmp = ready.dup
         redo
       end

data/lib/unicorn/oob_gc.rb

@@ -43,8 +43,8 @@
 #     use Unicorn::OobGC, 2, %r{\A/(?:expensive/foo|more_expensive/foo)}
 #
 # Feedback from users of early implementations of this module:
-# * https://bogomips.org/unicorn-public/0BFC98E9-072B-47EE-9A70-05478C20141B@lukemelia.com/
-# * https://bogomips.org/unicorn-public/AANLkTilUbgdyDv9W1bi-s_W6kq9sOhWfmuYkKLoKGOLj@mail.gmail.com/
+# * https://yhbt.net/unicorn-public/0BFC98E9-072B-47EE-9A70-05478C20141B@lukemelia.com/
+# * https://yhbt.net/unicorn-public/AANLkTilUbgdyDv9W1bi-s_W6kq9sOhWfmuYkKLoKGOLj@mail.gmail.com/
 
 module Unicorn::OobGC
 
@@ -60,7 +60,6 @@ module Unicorn::OobGC
     self.const_set :OOBGC_INTERVAL, interval
     ObjectSpace.each_object(Unicorn::HttpServer) do |s|
       s.extend(self)
-      self.const_set :OOBGC_ENV, s.instance_variable_get(:@request).env
     end
     app # pretend to be Rack middleware since it was in the past
   end
@@ -68,9 +67,10 @@ module Unicorn::OobGC
   #:stopdoc:
   def process_client(client)
     super(client) # Unicorn::HttpServer#process_client
-    if OOBGC_PATH =~ OOBGC_ENV['PATH_INFO'] && ((@@nr -= 1) <= 0)
+    env = instance_variable_get(:@request).env
+    if OOBGC_PATH =~ env['PATH_INFO'] && ((@@nr -= 1) <= 0)
       @@nr = OOBGC_INTERVAL
-      OOBGC_ENV.clear
+      env.clear
       disabled = GC.enable
       GC.start
       GC.disable if disabled

data/lib/unicorn/tmpio.rb

@@ -11,12 +11,18 @@ class Unicorn::TmpIO < File
   # immediately, switched to binary mode, and userspace output
   # buffering is disabled
   def self.new
+    path = nil
+
+    # workaround File#path being tainted:
+    # https://bugs.ruby-lang.org/issues/14485
     fp = begin
-      super("#{Dir::tmpdir}/#{rand}", RDWR|CREAT|EXCL, 0600)
+      path = "#{Dir::tmpdir}/#{rand}"
+      super(path, RDWR|CREAT|EXCL, 0600)
     rescue Errno::EEXIST
       retry
     end
-    unlink(fp.path)
+
+    unlink(path)
     fp.binmode
     fp.sync = true
     fp

data/lib/unicorn/version.rb

@@ -1 +1 @@
-Unicorn::Const::UNICORN_VERSION = '5.5.1'
+Unicorn::Const::UNICORN_VERSION = '6.0.0'

data/lib/unicorn.rb

@@ -96,7 +96,7 @@ module Unicorn
 
   # returns an array of strings representing TCP listen socket addresses
   # and Unix domain socket paths.  This is useful for use with
-  # Raindrops::Middleware under Linux: https://bogomips.org/raindrops/
+  # Raindrops::Middleware under Linux: https://yhbt.net/raindrops/
   def self.listener_names
     Unicorn::HttpServer::LISTENERS.map do |io|
       Unicorn::SocketHelper.sock_name(io)

data/man/man1/unicorn.1

@@ -1,5 +1,3 @@
-.\" Automatically generated by Pandoc 1.17.2
-.\"
 .TH "UNICORN" "1" "September 15, 2009" "Unicorn User Manual" ""
 .hy
 .SH NAME
@@ -11,73 +9,73 @@ unicorn [\-c CONFIG_FILE] [\-E RACK_ENV] [\-D] [RACKUP_FILE]
 .SH DESCRIPTION
 .PP
 A rackup(1)\-like command to launch Rack applications using Unicorn.
-It is expected to be started in your application root (APP_ROOT), but
-the "working_directory" directive may be used in the CONFIG_FILE.
+It is expected to be started in your application root (APP_ROOT),
+but the "working_directory" directive may be used in the CONFIG_FILE.
 .PP
-While unicorn takes a myriad of command\-line options for compatibility
-with ruby(1) and rackup(1), it is recommended to stick to the few
-command\-line options specified in the SYNOPSIS and use the CONFIG_FILE
-as much as possible.
+While unicorn takes a myriad of command\-line options for
+compatibility with ruby(1) and rackup(1), it is recommended to stick
+to the few command\-line options specified in the SYNOPSIS and use
+the CONFIG_FILE as much as possible.
 .SH RACKUP FILE
 .PP
-This defaults to "config.ru" in APP_ROOT.
-It should be the same file used by rackup(1) and other Rack launchers,
-it uses the \f[I]Rack::Builder\f[] DSL.
+This defaults to "config.ru" in APP_ROOT.  It should be the same
+file used by rackup(1) and other Rack launchers, it uses the
+\f[I]Rack::Builder\f[] DSL.
 .PP
-Embedded command\-line options are mostly parsed for compatibility with
-rackup(1) but strongly discouraged.
+Embedded command\-line options are mostly parsed for compatibility
+with rackup(1) but strongly discouraged.
 .SH UNICORN OPTIONS
 .TP
 .B \-c, \-\-config\-file CONFIG_FILE
-Path to the Unicorn\-specific config file.
-The config file is implemented as a Ruby DSL, so Ruby code may executed.
-See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-full list of directives available from the DSL.
-Using an absolute path for for CONFIG_FILE is recommended as it makes
-multiple instances of Unicorn easily distinguishable when viewing ps(1)
-output.
+Path to the Unicorn\-specific config file.  The config file is
+implemented as a Ruby DSL, so Ruby code may executed.
+See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the full
+list of directives available from the DSL.
+Using an absolute path for for CONFIG_FILE is recommended as it
+makes multiple instances of Unicorn easily distinguishable when
+viewing ps(1) output.
 .RS
 .RE
 .TP
 .B \-D, \-\-daemonize
-Run daemonized in the background.
-The process is detached from the controlling terminal and stdin is
-redirected to "/dev/null".
-Unlike many common UNIX daemons, we do not chdir to "/" upon
-daemonization to allow more control over the startup/upgrade process.
-Unless specified in the CONFIG_FILE, stderr and stdout will also be
-redirected to "/dev/null".
+Run daemonized in the background.  The process is detached from
+the controlling terminal and stdin is redirected to "/dev/null".
+Unlike many common UNIX daemons, we do not chdir to "/"
+upon daemonization to allow more control over the startup/upgrade
+process.
+Unless specified in the CONFIG_FILE, stderr and stdout will
+also be redirected to "/dev/null".
 .RS
 .RE
 .TP
 .B \-E, \-\-env RACK_ENV
-Run under the given RACK_ENV.
-See the RACK ENVIRONMENT section for more details.
+Run under the given RACK_ENV.  See the RACK ENVIRONMENT section
+for more details.
 .RS
 .RE
 .TP
 .B \-l, \-\-listen ADDRESS
-Listens on a given ADDRESS.
-ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken to
-mean a TCP socket and PATH is meant to be a path to a UNIX domain
-socket.
-Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080) For
-production deployments, specifying the "listen" directive in CONFIG_FILE
-is recommended as it allows fine\-tuning of socket options.
-\-N, \-\-no\-default\-middleware
+Listens on a given ADDRESS.  ADDRESS may be in the form of
+HOST:PORT or PATH, HOST:PORT is taken to mean a TCP socket
+and PATH is meant to be a path to a UNIX domain socket.
+Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080)
+For production deployments, specifying the "listen" directive in
+CONFIG_FILE is recommended as it allows fine\-tuning of socket
+options.
 .RS
 .RE
-Disables loading middleware implied by RACK_ENV.
-This bypasses the configuration documented in the RACK ENVIRONMENT
-section, but still allows RACK_ENV to be used for
-application/framework\-specific purposes.
+.TP
+.B \-N, \-\-no\-default\-middleware
+Disables loading middleware implied by RACK_ENV.  This bypasses the
+configuration documented in the RACK ENVIRONMENT section, but still
+allows RACK_ENV to be used for application/framework\-specific purposes.
 .RS
 .RE
 .SH RACKUP COMPATIBILITY OPTIONS
 .TP
 .B \-o, \-\-host HOST
-Listen on a TCP socket belonging to HOST, default is "0.0.0.0" (all
-addresses).
+Listen on a TCP socket belonging to HOST, default is
+"0.0.0.0" (all addresses).
 If specified multiple times on the command\-line, only the
 last\-specified value takes effect.
 This option only exists for compatibility with the rackup(1) command,
@@ -87,8 +85,8 @@ use of "\-l"/"\-\-listen" switch is recommended instead.
 .TP
 .B \-p, \-\-port PORT
 Listen on the specified TCP PORT, default is 8080.
-If specified multiple times on the command\-line, only the
-last\-specified value takes effect.
+If specified multiple times on the command\-line, only the last\-specified
+value takes effect.
 This option only exists for compatibility with the rackup(1) command,
 use of "\-l"/"\-\-listen" switch is recommended instead.
 .RS
@@ -101,9 +99,8 @@ No\-op, this exists only for compatibility with rackup(1).
 .SH RUBY OPTIONS
 .TP
 .B \-e, \-\-eval LINE
-Evaluate a LINE of Ruby code.
-This evaluation happens immediately as the command\-line is being
-parsed.
+Evaluate a LINE of Ruby code.  This evaluation happens
+immediately as the command\-line is being parsed.
 .RS
 .RE
 .TP
@@ -118,18 +115,17 @@ Turn on verbose warnings, the $VERBOSE variable is set to true.
 .RE
 .TP
 .B \-I, \-\-include PATH
-specify $LOAD_PATH.
-PATH will be prepended to $LOAD_PATH.
+specify $LOAD_PATH.  PATH will be prepended to $LOAD_PATH.
 The \[aq]:\[aq] character may be used to delimit multiple directories.
-This directive may be used more than once.
-Modifications to $LOAD_PATH take place immediately and in the order they
-were specified on the command\-line.
+This directive may be used more than once.  Modifications to
+$LOAD_PATH take place immediately and in the order they were
+specified on the command\-line.
 .RS
 .RE
 .TP
 .B \-r, \-\-require LIBRARY
-require a specified LIBRARY before executing the application.
-The "require" statement will be executed immediately and in the order
+require a specified LIBRARY before executing the application.  The
+"require" statement will be executed immediately and in the order
 they were specified on the command\-line.
 .RS
 .RE
@@ -141,15 +137,15 @@ HUP \- reload config file, app, and gracefully restart all workers
 .IP \[bu] 2
 INT/TERM \- quick shutdown, kills all workers immediately
 .IP \[bu] 2
-QUIT \- graceful shutdown, waits for workers to finish their current
-request before finishing.
+QUIT \- graceful shutdown, waits for workers to finish their
+current request before finishing.
 .IP \[bu] 2
-USR1 \- reopen all logs owned by the master and all workers See
-Unicorn::Util.reopen_logs for what is considered a log.
+USR1 \- reopen all logs owned by the master and all workers
+See Unicorn::Util.reopen_logs for what is considered a log.
 .IP \[bu] 2
-USR2 \- reexecute the running binary.
-A separate QUIT should be sent to the original process once the child is
-verified to be up and running.
+USR2 \- reexecute the running binary.  A separate QUIT
+should be sent to the original process once the child is verified to
+be up and running.
 .IP \[bu] 2
 WINCH \- gracefully stops workers but keep the master running.
 This will only work for daemonized processes.
@@ -158,7 +154,7 @@ TTIN \- increment the number of worker processes by one
 .IP \[bu] 2
 TTOU \- decrement the number of worker processes by one
 .PP
-See the SIGNALS (https://bogomips.org/unicorn/SIGNALS.html) document for
+See the SIGNALS (https://yhbt.net/unicorn/SIGNALS.html) document for
 full description of all signals used by Unicorn.
 .SH RACK ENVIRONMENT
 .PP
@@ -166,56 +162,61 @@ Accepted values of RACK_ENV and the middleware they automatically load
 (outside of RACKUP_FILE) are exactly as those in rackup(1):
 .IP \[bu] 2
 development \- loads Rack::CommonLogger, Rack::ShowExceptions, and
-Rack::Lint middleware
+              Rack::Lint middleware
 .IP \[bu] 2
 deployment \- loads Rack::CommonLogger middleware
 .IP \[bu] 2
 none \- loads no middleware at all, relying entirely on RACKUP_FILE
 .PP
-All unrecognized values for RACK_ENV are assumed to be "none".
-Production deployments are strongly encouraged to use "deployment" or
-"none" for maximum performance.
+All unrecognized values for RACK_ENV are assumed to be
+"none".  Production deployments are strongly encouraged to use
+"deployment" or "none" for maximum performance.
 .PP
-As of Unicorn 0.94.0, RACK_ENV is exported as a process\-wide
-environment variable as well.
-While not current a part of the Rack specification as of Rack 1.0.1,
-this has become a de facto standard in the Rack world.
+As of Unicorn 0.94.0, RACK_ENV is exported as a process\-wide environment
+variable as well.  While not current a part of the Rack specification as
+of Rack 1.0.1, this has become a de facto standard in the Rack world.
 .PP
 Note the Rack::ContentLength and Rack::Chunked middlewares are also
 loaded by "deployment" and "development", but no other values of
-RACK_ENV.
-If needed, they must be individually specified in the RACKUP_FILE, some
-frameworks do not require them.
+RACK_ENV.  If needed, they must be individually specified in the
+RACKUP_FILE, some frameworks do not require them.
 .SH ENVIRONMENT VARIABLES
 .PP
 The RACK_ENV variable is set by the aforementioned \-E switch.
-All application or library\-specific environment variables (e.g.
-TMPDIR) may always be set in the Unicorn CONFIG_FILE in addition to the
-spawning shell.
-When transparently upgrading Unicorn, all environment variables set in
-the old master process are inherited by the new master process.
+All application or library\-specific environment variables (e.g. TMPDIR)
+may always be set in the Unicorn CONFIG_FILE in addition to the spawning
+shell.  When transparently upgrading Unicorn, all environment variables
+set in the old master process are inherited by the new master process.
 Unicorn only uses (and will overwrite) the UNICORN_FD environment
 variable internally when doing transparent upgrades.
 .PP
 UNICORN_FD is a comma\-delimited list of one or more file descriptors
-used to implement USR2 upgrades.
-Init systems may bind listen sockets itself and spawn unicorn with
-UNICORN_FD set to the file descriptor numbers of the listen socket(s).
+used to implement USR2 upgrades.  Init systems may bind listen sockets
+itself and spawn unicorn with UNICORN_FD set to the file descriptor
+numbers of the listen socket(s).
 .PP
 As of unicorn 5.0, LISTEN_PID and LISTEN_FDS are used for socket
-activation as documented in the sd_listen_fds(3) manpage.
-Users relying on this feature do not need to specify a listen socket in
+activation as documented in the sd_listen_fds(3) manpage.  Users
+relying on this feature do not need to specify a listen socket in
 the unicorn config file.
 .SH SEE ALSO
 .IP \[bu] 2
 \f[I]Rack::Builder\f[] ri/RDoc
 .IP \[bu] 2
 \f[I]Unicorn::Configurator\f[] ri/RDoc
+.UR https://yhbt.net/unicorn/Unicorn/Configurator.html
+.UE
 .IP \[bu] 2
-Unicorn RDoc (https://bogomips.org/unicorn/)
+unicorn RDoc
+.UR https://yhbt.net/unicorn/
+.UE
 .IP \[bu] 2
-Rack RDoc (https://www.rubydoc.info/github/rack/rack/)
+Rack RDoc
+.UR https://www.rubydoc.info/github/rack/rack/
+.UE
 .IP \[bu] 2
-Rackup HowTo (https://github.com/rack/rack/wiki/tutorial-rackup-howto)
+Rackup HowTo
+.UR https://github.com/rack/rack/wiki/(tutorial)-rackup-howto
+.UE
 .SH AUTHORS
-The Unicorn Community <unicorn-public@bogomips.org>.
+The Unicorn Community <unicorn-public@yhbt.net>.