yahns 1.14.1 → 1.18.0

data/man/yahns-rackup.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -133,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YAHNS-RACKUP 1"
-.TH YAHNS-RACKUP 1 "1994-10-02" "yahns 1.13.0.6.g662f" "yahns user manual"
+.TH YAHNS-RACKUP 1 "1994-10-02" "yahns 1.16.0.24.g39049" "yahns user manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -171,6 +167,10 @@ Listens on a given \s-1ADDRESS.  ADDRESS\s0 may be in the form of
 and \s-1PATH\s0 is meant to be a path to a \s-1UNIX\s0 domain socket.
 Defaults to \*(L"0.0.0.0:9292\*(R" (all addresses on \s-1TCP\s0 port 9292).
 Multiple addresses may be separated with commas.
+.Sp
+For systemd users, a special value of \*(L"inherit\*(R" may be specified
+to inherit FDs using the \s-1LISTEN_FDS\s0 and \s-1LISTEN_PID\s0 environment
+variables described in \fIsd_listen_fds\fR\|(3)
 .IP "\-O stderr_path=PATHNAME" 4
 .IX Item "-O stderr_path=PATHNAME"
 Allow redirecting \f(CW$stderr\fR to a given path.  Unlike doing this from
@@ -268,12 +268,12 @@ See rackup documentation for more details.
 .SH "CONTACT"
 .IX Header "CONTACT"
 All feedback welcome via plain-text mail to <mailto:yahns\-public@yhbt.net>
-No subscription is necessary to post to the mailing list.
-List archives are available at <https://yhbt.net/yahns\-public/>
+No subscription is necessary to email us.
+Mail archives are available at <https://yhbt.net/yahns\-public/>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
 Copyright (C) 2013\-2016 all contributors <mailto:yahns\-public@yhbt.net>
-License: \s-1GPL\-3.0+ \s0<http://www.gnu.org/licenses/gpl\-3.0.txt>
+License: \s-1GPL\-3.0+ \s0<https://www.gnu.org/licenses/gpl\-3.0.txt>
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIyahns\fR\|(1), \fIyahns_config\fR\|(5),

data/man/yahns.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -133,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YAHNS 1"
-.TH YAHNS 1 "1994-10-02" "yahns 1.13.0.6.g662f" "yahns user manual"
+.TH YAHNS 1 "1994-10-02" "yahns 1.16.0.24.g39049" "yahns user manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -205,7 +201,7 @@ See \fIyahns_config\fR\|(5) for documentation on the configuration file format.
 .SH "CONTACT"
 .IX Header "CONTACT"
 All feedback welcome via plain-text mail to <mailto:yahns\-public@yhbt.net>
-No subscription is necessary to post to the mailing list.
+No subscription is necessary to email us.
 Mail archives are available at <https://yhbt.net/yahns\-public/>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"

data/man/yahns_config.5

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YAHNS_CONFIG 5"
-.TH YAHNS_CONFIG 5 "1994-10-02" "yahns 1.13.0.6.g662f" "yahns user manual"
+.TH YAHNS_CONFIG 5 "1994-10-02" "yahns 1.17.0.5.g4e5f" "yahns user manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -174,7 +174,7 @@ For Rack \s-1HTTP\s0 applications, see \*(L"\s-1RACK APP ARGUMENTS\*(R"\s0 for m
 information.
 .IP "before_exec &BLOCK" 4
 .IX Item "before_exec &BLOCK"
-This runs &BLOCK before Kernel#exec (\fIexecve\fR\|(2) wrapper).  The command
+This runs &BLOCK before Kernel#exec (\fBexecve\fR\|(2) wrapper).  The command
 array to be passed to Kernel#exec may be modified within this hook:
 .Sp
 .Vb 3
@@ -287,7 +287,7 @@ Default: / if daemonized, current working directory if not
 .IP "max_events \s-1INTEGER\s0" 4
 .IX Item "max_events INTEGER"
 This controls the number of events a worker thread will fetch at
-once via \fIepoll_wait\fR\|(2) or \fIkevent\fR\|(2).
+once via \fBepoll_wait\fR\|(2) or \fBkevent\fR\|(2).
 There is no good reason to change this
 unless you use very few (e.g. 1) worker_threads.  Leaving this at
 1 will give the fairest load balancing behavior with epoll or kqueue.
@@ -332,7 +332,7 @@ Default: false
 This controls the maximum size of a request body before it is
 buffered to the filesystem (instead of memory).  This has no effect
 if input_buffering is false.  This also governs the size of an
-individual \fIread\fR\|(2) system call when reading a request body.
+individual \fBread\fR\|(2) system call when reading a request body.
 .Sp
 There is generally no need to change this value and this directive
 may be removed in the future.
@@ -340,7 +340,7 @@ may be removed in the future.
 Default: 8192 bytes (8 kilobytes)
 .IP "client_header_buffer_size \s-1INTEGER\s0" 4
 .IX Item "client_header_buffer_size INTEGER"
-This controls the size of a single \fIread\fR\|(2) syscall for reading
+This controls the size of a single \fBread\fR\|(2) syscall for reading
 client request headers.  Increase this as needed if your application
 uses large cookies or long URLs.  Lowering this may reduce \s-1GC\s0 and
 memory allocator overhead.
@@ -463,12 +463,12 @@ this means Unix domain sockets must not be placed in /tmp
 The following \s-1OPTIONS\s0 may be specified (but are generally not needed):
 .IP "backlog: \s-1INTEGER\s0" 4
 .IX Item "backlog: INTEGER"
-This is the backlog of the \fIlisten\fR\|(2) syscall.
+This is the backlog of the \fBlisten\fR\|(2) syscall.
 .Sp
 Some operating systems allow negative values here to specify the
 maximum allowable value.  In most cases, this number is only
 recommendation and there are other OS-specific tunables and
-variables that can affect this number.  See the \fIlisten\fR\|(2)
+variables that can affect this number.  See the \fBlisten\fR\|(2)
 syscall documentation of your \s-1OS\s0 for the exact semantics of
 this.
 .Sp
@@ -495,7 +495,7 @@ Default: Operating-system dependent
 Maximum receive and send buffer sizes (in bytes) of sockets.
 .Sp
 These correspond to the \s-1SO_RCVBUF\s0 and \s-1SO_SNDBUF\s0 settings which
-can be set via the \fIsetsockopt\fR\|(2) syscall.  Some kernels
+can be set via the \fBsetsockopt\fR\|(2) syscall.  Some kernels
 (e.g. Linux 2.4+) have intelligent auto-tuning mechanisms and
 there is no need (and it is sometimes detrimental) to specify them.
 .Sp
@@ -511,8 +511,8 @@ This enables multiple, independently-started yahns instances to
 bind to the same port (as long as all the processes enable this).
 .Sp
 This option must be used when yahns first binds the listen socket.
-It cannot be enabled when a socket is inherited via \s-1SIGUSR2
-\&\s0(but it will remain on if inherited), and it cannot be enabled
+It cannot be enabled when a socket is inherited via \s-1SIGUSR2\s0
+(but it will remain on if inherited), and it cannot be enabled
 directly via \s-1SIGHUP.\s0
 .Sp
 Note: there is a chance of connections being dropped if
@@ -529,7 +529,7 @@ To enable \s-1TLS\s0 connections, you must configure this yourself.
 See documentation for OpenSSL::SSL::SSLContext
 for more information:
 .Sp
-<http://docs.ruby\-lang.org/en/trunk/OpenSSL/SSL/SSLContext.html>
+<https://docs.ruby\-lang.org/en/trunk/OpenSSL/SSL/SSLContext.html>
 .Sp
 Default: none
 .Sp
@@ -539,22 +539,22 @@ An example which seems to work is:
 \&  require \*(Aqopenssl\*(Aq
 \&  ssl_ctx = OpenSSL::SSL::SSLContext.new
 \&  ssl_ctx.cert = OpenSSL::X509::Certificate.new(
-\&    IO.read(\*(Aq/etc/ssl/certs/example.crt\*(Aq)
+\&    File.read(\*(Aq/etc/ssl/certs/example.crt\*(Aq)
 \&  )
 \&  ssl_ctx.extra_chain_cert = [
 \&    OpenSSL::X509::Certificate.new(
-\&      IO.read(\*(Aq/etc/ssl/certs/chain.crt\*(Aq)
+\&      File.read(\*(Aq/etc/ssl/certs/chain.crt\*(Aq)
 \&    )
 \&  ]
 \&  ssl_ctx.key = OpenSSL::PKey::RSA.new(
-\&    IO.read(\*(Aq/etc/ssl/private/example.key\*(Aq)
+\&    File.read(\*(Aq/etc/ssl/private/example.key\*(Aq)
 \&  )
 \&
 \&  # use defaults provided by Ruby on top of OpenSSL,
-\&  # but disable client certificate verification as it is rare:
+\&  # but disable client certificate verification as it is rare for servers:
 \&  ssl_ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
 \&
-\&  # Built\-in session cache (only works if worker_processes is nil or 1)
+\&  # Built\-in session cache (only useful if worker_processes is nil or 1)
 \&  ssl_ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER
 \&
 \&  app(:rack, "/path/to/my/app/config.ru") do
@@ -676,7 +676,7 @@ here means yahns will enable yahns to use a master/worker process
 model instead of a single process.
 .Sp
 If an optional &BLOCK is given, it may be used to configure
-\&\fIpthread_atfork\fR\|(3)\-style hooks.
+\&\fBpthread_atfork\fR\|(3)\-style hooks.
 See \*(L"\s-1WORKER_PROCESSES\-LEVEL DIRECTIVES\*(R"\s0 for details.
 .Sp
 Using worker_processes is strongly recommended if your application
@@ -692,7 +692,7 @@ Note: all of the atfork_* hooks described here are available inside the
 \&\*(L"app\*(R" blocks, too.
 .IP "atfork_prepare &BLOCK" 4
 .IX Item "atfork_prepare &BLOCK"
-This &BLOCK is executed in the parent before \fIfork\fR\|(2) operation.
+This &BLOCK is executed in the parent before \fBfork\fR\|(2) operation.
 This may be useful for app directives which specify \*(L"preload: true\*(R"
 to disconnect from databases or otherwise close open file descriptors
 to prevent them from being shared with the children.
@@ -700,12 +700,12 @@ to prevent them from being shared with the children.
 Default: none
 .IP "atfork_parent &BLOCK" 4
 .IX Item "atfork_parent &BLOCK"
-This &BLOCK is executed in the parent after the \fIfork\fR\|(2) operation.
+This &BLOCK is executed in the parent after the \fBfork\fR\|(2) operation.
 .Sp
 Default: none
 .IP "atfork_child &BLOCK" 4
 .IX Item "atfork_child &BLOCK"
-This &BLOCK is executed in the child after the \fIfork\fR\|(2) operation.
+This &BLOCK is executed in the child after the \fBfork\fR\|(2) operation.
 .Sp
 This may be useful for app directives which specify \*(L"preload: true\*(R"
 to reconnect to databases or reopen closed file descriptors which
@@ -714,7 +714,7 @@ were closed in the atfork_prepare hook.
 Default: none
 .SH "RACK APP ARGUMENTS"
 .IX Header "RACK APP ARGUMENTS"
-Rack applications take a \s-1PATHNAME\s0 to the \fIrackup\fR\|(1) config file
+Rack applications take a \s-1PATHNAME\s0 to the \fBrackup\fR\|(1) config file
 (e.g.  \*(L"config.ru\*(R") as its first argument.
 .PP
 The only supported keyword argument is:
@@ -737,17 +737,17 @@ compatibility.
 See the examples/ directory in the git source tree.
 .PP
 .Vb 1
-\&  git clone git://yhbt.net/yahns.git
+\&  git clone https://yhbt.net/yahns.git
 .Ve
 .SH "CONTACT"
 .IX Header "CONTACT"
 All feedback welcome via plain-text mail to <mailto:yahns\-public@yhbt.net>
-No subscription is necessary to post to the mailing list.
-List archives are available at <https://yhbt.net/yahns\-public/>
+No subscription is necessary to email us.
+Mail archives are available at <https://yhbt.net/yahns\-public/>
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
 Copyright (C) 2013\-2016 all contributors <mailto:yahns\-public@yhbt.net>
-License: \s-1GPL\-3.0+ \s0<http://www.gnu.org/licenses/gpl\-3.0.txt>
+License: \s-1GPL\-3.0+\s0 <https://www.gnu.org/licenses/gpl\-3.0.txt>
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-\&\fIyahns\fR\|(1)
+\&\fByahns\fR\|(1)

data/test/helper.rb

@@ -125,7 +125,7 @@ class IO
 end if ! IO.method_defined?(:nread) && RUBY_PLATFORM =~ /linux/
 
 def cloexec_pipe
-  IO.pipe.each { |io| io.close_on_exec = true }
+  IO.pipe
 end
 
 def require_exec(cmd)
@@ -136,6 +136,10 @@ def require_exec(cmd)
   false
 end
 
+def xfork
+  GTL.synchronize { fork { yield } }
+end
+
 class DieIfUsed
   @@n = 0
   def each
@@ -154,7 +158,7 @@ def skip_skb_mem
   [ [ '/proc/sys/net/ipv4/tcp_rmem', "4096	87380	6291456\n" ],
     [ '/proc/sys/net/ipv4/tcp_wmem', "4096	16384	4194304\n" ]
   ].each do |file, expect|
-    val = IO.read(file)
+    val = File.read(file)
     val == expect or skip "#{file} had: #{val}expected: #{expect}"
   end
 end

data/test/server_helper.rb

@@ -31,7 +31,7 @@ module ServerHelper
 
   def quit_wait(pid)
     pid or return
-    err = $!
+    err = $! and warn "Terminating on #{err.inspect} (#{err.class})"
     Process.kill(:QUIT, pid)
     _, status = Timeout.timeout(10) { Process.waitpid2(pid) }
     assert status.success?, status.inspect
@@ -52,9 +52,7 @@ module ServerHelper
   # only use for newly bound sockets
   def get_tcp_client(host, port, tries = 500)
     begin
-      c = TCPSocket.new(host, port)
-      c.close_on_exec = true
-      return c
+      return TCPSocket.new(host, port)
     rescue Errno::ECONNREFUSED
       raise if tries < 0
       tries -= 1
@@ -65,16 +63,33 @@ module ServerHelper
     @srv.close if defined?(@srv) && !@srv.closed?
     @ru.close! if defined?(@ru) && @ru
     check_err if defined?(@err)
+    Timeout.timeout(30) do
+      Process.kill(:TERM, @tail_pid)
+      Process.waitpid(@tail_pid)
+    end if @tail_pid
   end
 
   def server_helper_setup
     @srv = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0)
     @err = tmpfile(%w(srv .err))
     @ru = nil
+    @tail_pid = nil
+    case tail = ENV['TAIL']
+    when '1'
+      tail = 'tail -f' # POSIX
+    when nil, '0'
+      tail = nil
+    # else : allow users to specify 'tail -F' or 'gtail -F' for GNU
+    end
+    if tail
+      cmd = tail.split(/\s+/)
+      cmd << @err.path
+      @tail_pid = spawn(*cmd)
+    end
   end
 
   def mkserver(cfg, srv = @srv)
-    fork do
+    xfork do
       ENV["YAHNS_FD"] = srv.fileno.to_s
       srv.autoclose = false
       yield if block_given?

data/test/test_bin.rb

@@ -9,40 +9,41 @@ class TestBin < Testcase
 
   def setup
     server_helper_setup
-    @cmd = %W(ruby -I lib bin/yahns)
+    @cmd = %W(#{RbConfig.ruby} -I lib bin/yahns)
   end
 
   def test_listen_fd3
     return unless RUBY_VERSION.to_f > 2.3 # Fixed in ruby/trunk r51209, actually
-    @srv.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, 0)
     host, port = @srv.addr[3], @srv.addr[1]
 
     ru = tmpfile(%w(test_bin_daemon .ru))
     ru.write("require 'rack/lobster'; run Rack::Lobster.new\n")
-    cmd = %W(ruby -I lib bin/yahns-rackup
-             -E none -p #{port} -o #{host} #{ru.path})
-    pid = fork do # emulate a systemd environment
-      env = {
-        'LISTEN_PID' => $$.to_s,
-        'LISTEN_FDS' => '1',
-      }
-      exec env, *cmd, 3 => @srv, err: @err.path
-    end
-    Net::HTTP.start(host, port) do |http|
-      req = Net::HTTP::Get.new("/")
-      res = http.request(req)
-      assert_equal 200, res.code.to_i
-      assert_equal "keep-alive", res["Connection"]
+    cmd = %W(#{RbConfig.ruby} -I lib bin/yahns-rackup -E none #{ru.path})
+    [ %w(-O listen=inherit), %W(-p #{port} -o #{host}) ].each do |opt|
+      @srv.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, 0)
+      begin
+        pid = xfork do # emulate a systemd environment
+          env = { 'LISTEN_PID' => $$.to_s, 'LISTEN_FDS' => '1' }
+          cmd.concat(opt)
+          exec env, *cmd, 3 => @srv, err: @err.path
+        end
+        Net::HTTP.start(host, port) do |http|
+          req = Net::HTTP::Get.new("/")
+          res = http.request(req)
+          assert_equal 200, res.code.to_i
+          assert_equal "keep-alive", res["Connection"]
+        end
+        assert @srv.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).bool,
+                     'ensure the inheriting process applies TCP socket options'
+      ensure
+        if pid
+          Process.kill(:QUIT, pid)
+          _, status = Process.waitpid2(pid)
+          assert status.success?, status.inspect
+        end
+      end
     end
-
-    assert_equal 1, @srv.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).int,
-                 'ensure the inheriting process applies TCP socket options'
   ensure
-    if pid
-      Process.kill(:QUIT, pid)
-      _, status = Process.waitpid2(pid)
-      assert status.success?, status.inspect
-    end
     ru.close! if ru
   end
 
@@ -76,7 +77,7 @@ class TestBin < Testcase
     cfg.puts "end"
     @cmd.concat(%W(-D -c #{cfg.path}))
     addr = cloexec_pipe
-    pid = fork do
+    pid = xfork do
       opts = { close_others: true }
       addr[0].close
       if inherit
@@ -98,7 +99,10 @@ class TestBin < Testcase
       # Even with a synchronous FD_CLOEXEC, there's a chance of a race
       # because the server does not bind right away.
       unless inherit
-        @srv.shutdown
+        begin
+          @srv.shutdown
+        rescue Errno::ENOTCONN
+        end
         @srv.close
       end
       exec(*@cmd)
@@ -158,11 +162,10 @@ class TestBin < Testcase
     # need to fork here since tests are MT and the FD can leak out and go to
     # other processes which fork (but do not exec), causing ETXTBUSY on
     # Process.spawn
-    pid = fork do
-      ruby = "#!#{`which ruby`}"
+    pid = xfork do
       File.open(exe, "w") { |y|
         lines = File.readlines("bin/yahns")
-        lines[0] = ruby
+        lines[0] = "#!#{RbConfig.ruby}\n"
         y.chmod(0755)
         y.syswrite(lines.join)
       }
@@ -190,7 +193,7 @@ class TestBin < Testcase
     }
     cmd = %W(#{exe} -D -c #{cfg.path})
     cmd << { @srv => @srv, close_others: true }
-    pid = GTL.synchronize { Process.spawn(env, *cmd) }
+    pid = Process.spawn(env, *cmd)
     res = Net::HTTP.start(host, port) { |h| h.get("/") }
     assert_equal 200, res.code.to_i
     orig = res.body

data/test/test_config.rb

@@ -13,7 +13,7 @@ class TestConfig < Testcase
   end
 
   def test_multi_conf_example
-    pid = fork do
+    pid = xfork do
       tmpdir = yahns_mktmpdir
 
       # modify the example config file for testing
@@ -37,7 +37,7 @@ class TestConfig < Testcase
   end
 
   def test_rack_basic_conf_example
-    pid = fork do
+    pid = xfork do
       tmpdir = yahns_mktmpdir
 
       # modify the example config file for testing

data/test/test_extras_exec_cgi.rb

@@ -170,7 +170,7 @@ class TestExtrasExecCGI < Testcase
         assert_match %r{\A\d+\n\z}, body
         exec_pid = body.to_i
         poke_until_dead exec_pid
-        assert_raises(EOFError) { c.read_nonblock(666) }
+        assert_raises(EOFError) { c.readpartial(666) }
       else
         raise "BUG in test, bad rtype"
       end
@@ -179,4 +179,27 @@ class TestExtrasExecCGI < Testcase
     c.close if c
     quit_wait(pid)
   end
+
+  def test_rlimit_options
+    err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
+    tout = 1
+    opts = { rlimit_cpu: tout, rlimit_core: 0 }
+    cmd = [ '/bin/sh', '-c', 'while :; do :;done', opts ]
+    pid = mkserver(cfg) do
+      require './extras/exec_cgi'
+      cfg.instance_eval do
+        stack = Rack::ContentLength.new(Rack::Chunked.new(ExecCgi.new(*cmd)))
+        app(:rack, stack) { listen "#{host}:#{port}" }
+        stderr_path err.path
+        worker_processes 1
+      end
+    end
+    c = get_tcp_client(host, port)
+    c.write "GET / HTTP/1.0\r\n\r\n"
+    assert_same c, c.wait(tout + 5)
+    assert_match %r{ 500 Internal Server Error\b}, c.readpartial(4096)
+    c.close
+  ensure
+    quit_wait(pid)
+  end
 end

data/test/test_extras_try_gzip_static.rb

@@ -52,7 +52,7 @@ class TestExtrasTryGzipStatic < Testcase
       File.symlink "COPYING", "#{tmpdir}/COPYING.relsymlink"
       gplgz = "#{tmpdir}/COPYING.gz"
       FileUtils.cp("COPYING", gpl)
-      _, status = Process.waitpid2(fork do
+      _, status = Process.waitpid2(xfork do
         File.open(gplgz, "w") do |fp|
           Zlib::GzipWriter.wrap(fp.dup) { |io| io.write(GPL_TEXT) }
         end

data/test/test_mt_accept.rb

@@ -14,7 +14,6 @@ class TestMtAccept < Testcase
     skip "Linux kernel required" unless RUBY_PLATFORM =~ /linux/
     skip "/proc not mounted" unless File.directory?("/proc")
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
-    opts = { threads: 1 }
     cfg.instance_eval do
       GTL.synchronize do
         app(:rack, Rack::Lobster.new) { listen "#{host}:#{port}", threads: 1 }
@@ -29,7 +28,6 @@ class TestMtAccept < Testcase
     quit_wait(pid)
 
     cfg = Yahns::Config.new
-    opts = { threads: 1 }
     cfg.instance_eval do
       GTL.synchronize do
         app(:rack, Rack::Lobster.new) { listen "#{host}:#{port}", threads: 2 }

data/test/test_proxy_pass.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'digest'
 begin
   require 'kcar'
+  require 'yahns/proxy_pass'
 rescue LoadError
 end
 
@@ -188,7 +189,6 @@ class TestProxyPass < Testcase
     pid = mkserver(cfg) do
       @srv.autoclose = @srv2.autoclose = false
       ENV["YAHNS_FD"] = "#{@srv.fileno},#{@srv2.fileno}"
-      require 'yahns/proxy_pass'
       cfg.instance_eval do
         app(:rack, Yahns::ProxyPass.new("unix:#{unix_path}:/$fullpath")) do
           listen "#{host}:#{port}"
@@ -251,7 +251,6 @@ class TestProxyPass < Testcase
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
     host2, port2 = @srv2.addr[3], @srv2.addr[1]
     pid = mkserver(cfg) do
-      require 'yahns/proxy_pass'
       @srv2.close
       cfg.instance_eval do
         app(:rack, Yahns::ProxyPass.new("http://#{host2}:#{port2}")) do

data/test/test_proxy_pass_no_buffering.rb

@@ -4,6 +4,7 @@
 require_relative 'server_helper'
 begin
   require 'kcar'
+  require 'yahns/proxy_pass'
 rescue LoadError
 end
 require 'digest/md5'
@@ -39,7 +40,6 @@ class TestProxyPassNoBuffering < Testcase
     @srv2 = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0)
     server_helper_setup
     skip "kcar missing yahns/proxy_pass" unless defined?(Kcar)
-    require 'yahns/proxy_pass'
     @tmpdir = yahns_mktmpdir
   end