yahns 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5dcbf514b3bf6c9e92c8f0ca7d038019148217ffe6f3a88ab6ea7810333487e
-  data.tar.gz: 4bfd3e6b7a2806daf1e53094050d928a9c28cd1b330ef594a118c2b6bd9d7c86
+  metadata.gz: 728a55c5f8af10a1f3dff8d71444a89d5cb5990ecc00613266c5f62405b5eec0
+  data.tar.gz: a7eff02b1cb3fea5470ef6232ee624a50e57a91ffcea234e31a1fcd829920c52
 SHA512:
-  metadata.gz: 7f8123dcd0921c5c224bdb76009c7d7b1e751da62e2f30690ab438f959e234710afdb1f1b57ecfe64dc8b437ac782f95b69348c7177ecfe1e302173bc494574a
-  data.tar.gz: 7f0e74b4271f4ec44bd2b800b0eb6fa4a570ecd538cf42f79c31ddf92c2552d98bade3a9396d8fd02ba9e16a2f145eb2a028b9050b01e931f90f42adcbf1767a
+  metadata.gz: cfa4b7b2842701c03611c666d85be9cf22c975d10e69d8f9642181b4241cc80919ef6a9e012996e34012f49bc0dad024a766bff0718278aed8957d4421fd953d
+  data.tar.gz: 965ed79f974891574b2cba0c31f44bc61160f4cbfb59488d528f38eca0e5e8198259447b2ca45fc5e4386d6216ed09f27c8a30bbd0fae753ebfbabb9f443fb49

data/Documentation/GNUmakefile

@@ -60,7 +60,7 @@ all :: txt
 
 %.txt : %.pod
 	$(pod2text) $< $@+
-	-touch -r $< $@+ 2>/dev/null # GNU-ism
+	touch -r $< $@+
 	mv $@+ $@
 
 clean::

data/Documentation/yahns-rackup.pod

@@ -166,8 +166,8 @@ See rackup documentation for more details.
 =head1 CONTACT
 
 All feedback welcome via plain-text mail to L<mailto:yahns-public@yhbt.net>
-No subscription is necessary to post to the mailing list.
-List archives are available at L<https://yhbt.net/yahns-public/>
+No subscription is necessary to email us.
+Mail archives are available at L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT
 

data/Documentation/yahns.pod

@@ -83,7 +83,7 @@ See L<yahns_config(5)> for documentation on the configuration file format.
 =head1 CONTACT
 
 All feedback welcome via plain-text mail to L<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 L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT

data/Documentation/yahns_config.pod

@@ -661,8 +661,8 @@ See the examples/ directory in the git source tree.
 =head1 CONTACT
 
 All feedback welcome via plain-text mail to L<mailto:yahns-public@yhbt.net>
-No subscription is necessary to post to the mailing list.
-List archives are available at L<https://yhbt.net/yahns-public/>
+No subscription is necessary to email us.
+Mail archives are available at L<https://yhbt.net/yahns-public/>
 
 =head1 COPYRIGHT
 

data/GIT-VERSION-GEN

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# Copyright (C) 2013-2019 all contributors <yahns-public@yhbt.net>
 # License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.16.0"
+DEF_VER = "v1.17.0"
 vn = DEF_VER.dup
 
 # First see if there is a version file (included in release tarballs),

data/HACKING

@@ -9,7 +9,7 @@ development dependencies
 * git - https://www.git-scm.com/
 * ruby - https://www.ruby-lang.org/en/
 
-	git clone https://yhbt.net/yahns
+	git clone https://yhbt.net/yahns.git
 
 tests
 -----
@@ -42,15 +42,14 @@ installing from git
 contact
 -------
 
-We use git(7) and develop yahns on a public mailing list like git
-developers do.  Please send patches via git-send-email(1) to the public
-mailing list at <yahns-public@yhbt.net>.  Pull requests should be
-formatted using git-request-pull(1).
+We use git(7) and develop yahns using email like git.git hackers do.
+Please send patches via git-send-email(1) to us at <yahns-public@yhbt.net>.
+Pull requests should be formatted using git-request-pull(1).
 
 All mail is archived publically at: https://yhbt.net/yahns-public/
 Anonymous contributions will always be welcome.
-No subscription is necessary to post to the mailing list.
-Please remember to Cc: all recipients as subscription is optional.
+No subscription is necessary to email us.
+Please remember to reply-to-all as we do not encourage subscription.
 
 Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
 License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/README

@@ -16,6 +16,7 @@ Features
 * suitable for slow clients, fast clients, or a mixture of both
 * HTTP/0.9 support
 * HTTP/1.1 persistent connections and pipelining
+* HTTPS for HTTP/1.1 support
 * decodes HTTP chunked encoding for requests
 * parses HTTP/1.1 trailers in requests
 * supports streaming responses with lazy buffering for slow clients
@@ -55,37 +56,31 @@ Contact
 
 We are happy to see feedback of all types via plain-text email.
 Please send comments, user/dev discussion, patches, bug reports,
-and pull requests to the open-to-all mailing list at:
+and pull requests to our public inbox at:
 
 	yahns-public@yhbt.net
 
-No subscription is necessary to post.  Please Cc: all recipients as
-subscription is not necessary.
+Please use reply-to-all as we do not require any sort of subscription.
+We archive all of our mail publically at:
 
-You may optionally subscribe by sending an email to:
+	https://yhbt.net/yahns-public/
+	nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
 
-	yahns-public+subscribe@yhbt.net
-
-We suck at delivering email, so relying on the archives might be
-a better bet:
-
-Mailing list archives browsable via HTTPS: https://yhbt.net/yahns-public/
-Or NNTP: nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
 Atom feed: https://yhbt.net/yahns-public/new.atom
 
 This README is our homepage, we would rather be working on HTTP servers
 all day than worrying about the next browser vulnerability because
 HTML/CSS/JS is too complicated for us.
 
-* https://yhbt.net/yahns/README
+* https://yhbt.net/yahns.git/about/
 
 Hacking
 -------
 
 We use git and follow the same development model as git itself
-(mailing list-oriented, benevolent dictator).
+(email-oriented, benevolent dictator).
 
-	git clone https://yhbt.net/yahns
+	git clone https://yhbt.net/yahns.git
 
 Please use git-format-patch(1) and git-send-email(1) distributed with
 the git(7) suite for generating and sending patches.  Please format

data/extras/autoindex.rb

@@ -14,6 +14,21 @@ class Autoindex
   FN = %{<a href="%s">%s</a>}
   TFMT = "%Y-%m-%d %H:%M"
 
+  # default to a dark, web-safe (216 color) palette for power-savings.
+  # Color-capable browsers can respect the prefers-color-scheme:light
+  # @media query (browser support a work-in-progress)
+  STYLE = <<''.gsub(/^\s*/m, '').delete!("\n")
+@media screen {
+  *{background:#000;color:#ccc}
+  a{color:#69f;text-decoration:none}
+  a:visited{color:#96f}
+}
+@media screen AND (prefers-color-scheme:light) {
+  *{background:#fff;color:#333}
+  a{color:#00f;text-decoration:none}
+  a:visited{color:#808}
+}
+
   def initialize(app, *args)
     app.respond_to?(:root) or raise ArgumentError,
        "wrapped app #{app.inspect} does not respond to #root"
@@ -139,8 +154,9 @@ def call(env)
       path_info_html = path_info_ue.split(%r{/}, -1).map! do |part|
         Rack::Utils.escape_html(part)
       end.join("/")
-      body = "<html><head><title>Index of #{path_info_html}</title></head>" \
-             "<body><h1>Index of #{path_info_html}</h1><hr><pre>\n" \
+      body = "<html><head><title>Index of #{path_info_html}</title>" \
+             "<style>#{STYLE}</style>" \
+             "</head><body><h1>Index of #{path_info_html}</h1><hr><pre>\n" \
              "#{dirs.concat(files).join("\n")}" \
              "</pre><hr></body></html>\n"
       h = { "Content-Type" => "text/html", "Content-Length" => body.size.to_s }

data/extras/exec_cgi.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
-# License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2013-2018 all contributors <yahns-public@yhbt.net>
+# License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
 # frozen_string_literal: true
 #
 # if running under yahns, worker_processes is recommended to avoid conflicting
@@ -18,21 +18,31 @@
 #   use Rack::Chunked
 #   # other Rack middlewares can go here...
 #
-#   run ExecCgi.new('/path/to/cgit.cgi') # cgit: https://git.zx2c4.com/cgit/
+#   # cgit: https://git.zx2c4.com/cgit/
+#   run ExecCgi.new('/path/to/cgit.cgi', opts)
 #
 class ExecCgi
-  class MyIO < Kgio::Pipe
+  class MyIO
     attr_writer :my_pid
     attr_writer :body_tip
+    attr_reader :rd
+
+    def initialize(rd)
+      @rd = rd
+    end
 
     def each
-      buf = @body_tip || ''.dup
-      if buf.size > 0
-        yield buf
-      end
-      while tmp = kgio_read(8192, buf)
+      buf = @body_tip
+      yield buf unless buf.empty?
+
+      case tmp = @rd.read_nonblock(8192, buf, exception: false)
+      when :wait_readable
+        @rd.wait_readable
+      when nil
+        break
+      else # String
         yield tmp
-      end
+      end while true
       self
     ensure
       # do this sooner, since the response body may be buffered, we want
@@ -46,8 +56,8 @@ def close
       # Note: this object (and any client-specific objects) will never
       # be shared across different threads, so we do not need extra
       # mutual exclusion here.
-      return if closed?
-      super
+      return if @rd.closed?
+      @rd.close
       begin
         Process.waitpid(@my_pid)
       rescue Errno::ECHILD
@@ -72,7 +82,7 @@ def close
     SERVER_PROTOCOL
     SERVER_SOFTWARE
     SCRIPT_NAME
-  ).map(&:freeze)  # frozen strings are faster for Hash assignments
+  )
 
   def initialize(*args)
     @env = Hash === args[0] ? args.shift : {}
@@ -82,6 +92,7 @@ def initialize(*args)
     first[0] == ?/ or args[0] = ::File.expand_path(first)
     File.executable?(args[0]) or
       raise ArgumentError, "#{args[0]} is not executable"
+    @opts = Hash === args[-1] ? args.pop : {}
   end
 
   # Calls the app
@@ -90,20 +101,23 @@ def call(env)
     cgi_env = { "GATEWAY_INTERFACE" => "CGI/1.1" }
     PASS_VARS.each { |key| val = env[key] and cgi_env[key] = val }
     env.each { |key,val| cgi_env[key] = val if key =~ /\AHTTP_/ }
-    pipe = MyIO.pipe
-    errbody = pipe[0]
-    errbody.my_pid = Process.spawn(cgi_env.merge!(@env), *@args,
-                                   out: pipe[1], close_others: true)
-    pipe[1].close
-    pipe = pipe[0]
 
-    if head = pipe.kgio_read(8192)
+    rd, wr = IO.pipe
+    io = MyIO.new(rd)
+    errbody = io
+    errbody.my_pid = spawn(cgi_env.merge!(@env), *@args,
+                           @opts.merge(out: wr, close_others: true))
+    wr.close
+
+    begin
+      head = rd.readpartial(8192)
       until head =~ /\r?\n\r?\n/
-        tmp = pipe.kgio_read(8192) or break
+        tmp = rd.readpartial(8192)
         head << tmp
+        tmp.clear
       end
       head, body = head.split(/\r?\n\r?\n/, 2)
-      pipe.body_tip = body
+      io.body_tip = body
 
       env["HTTP_VERSION"] ||= "HTTP/1.0" # stop Rack::Chunked for HTTP/0.9
 
@@ -117,8 +131,8 @@ def call(env)
       end
       status = headers.delete("Status") || 200
       errbody = nil
-      [ status, headers, pipe ]
-    else
+      [ status, headers, io ]
+    rescue EOFError
       [ 500, { "Content-Length" => "0", "Content-Type" => "text/plain" }, [] ]
     end
   ensure

data/extras/proxy_pass.rb

@@ -36,7 +36,7 @@ class UpstreamSocket < Kgio::Socket # :nodoc:
     attr_writer :expiry
 
     # called automatically by kgio_read!
-    def kgio_wait_readable(timeout = nil)
+    def wait_readable(timeout = nil)
       super(timeout || wait_time)
     end
 
@@ -59,7 +59,7 @@ def req_write(buf, timeout)
       @expiry = Time.now + timeout
       case rv = kgio_trywrite(buf)
       when :wait_writable
-        kgio_wait_writable(wait_time)
+        wait_writable(wait_time)
       when nil
         return
       when String

data/lib/yahns.rb

@@ -5,6 +5,7 @@
 
 require 'unicorn' # pulls in raindrops, kgio, fcntl, etc, stringio, and logger
 require 'sleepy_penguin'
+require 'io/wait'
 
 # kill off some unicorn internals we don't need
 # we'll probably just make kcar into a server parser so we don't depend
@@ -16,8 +17,9 @@
 end
 
 # yahns exposes no user-visible API outside of the config file.
-# See https://yhbt.net/yahns/yahns_config.txt for the config documentation
-# and https://yhbt.net/yahns/ for the homepage.
+# See https://yhbt.net/yahns.git/tree/examples/yahns_config.txt
+# for the config documentation
+# and https://yhbt.net/yahns.git/about/ for the homepage.
 # Internals are subject to change.
 
 module Yahns

data/lib/yahns/config.rb

@@ -4,8 +4,8 @@
 # frozen_string_literal: true
 #
 # Implements a DSL for configuring a yahns server.
-# See https://yhbt.net/yahns/examples/yahns_multi.conf.rb for a full
-# example configuration file.
+# See https://yhbt.net/yahns.git/tree/examples/yahns_multi.conf.rb
+# for a full example configuration file.
 class Yahns::Config # :nodoc:
   # public within yahns itself, NOT a public interface for users outside
   # of yahns.  See yahns/rack for usage example
@@ -409,7 +409,7 @@ def errors(val)
     if String === val
       # we've already bound working_directory by the time we get here
       val = File.open(File.expand_path(val), "ab")
-      val.close_on_exec = val.sync = true
+      val.sync = true
     else
       rt = [ :puts, :write, :flush ] # match Rack::Lint
       rt.all? { |m| val.respond_to?(m) } or raise ArgumentError,

data/lib/yahns/daemon.rb

@@ -32,7 +32,6 @@ def self.daemon(yahns_server)
       # We cannot use Yahns::Sigevent (eventfd) here because we need
       # to detect EOF on unexpected death, not just read/write
       rd, wr = IO.pipe
-      rd.close_on_exec = wr.close_on_exec = true
       grandparent = $$
       if fork
         wr.close # grandparent does not write

data/lib/yahns/http_client.rb

@@ -235,25 +235,17 @@ def app_call(input)
     http_response_write(res, opt)
   end
 
-  # called automatically by kgio_write
-  def kgio_wait_writable(timeout = self.class.client_timeout)
-    super timeout
-  end
-
-  # called automatically by kgio_read
-  def kgio_wait_readable(timeout = self.class.client_timeout)
-    super timeout
-  end
-
   # used by StreamInput (and thus TeeInput) for input_buffering {false|:lazy}
   def yahns_read(bytes, buf)
     case rv = kgio_tryread(bytes, buf)
     when String, nil
       return rv
     when :wait_readable
-      kgio_wait_readable or raise Yahns::ClientTimeout, "waiting for read", []
+      wait_readable(self.class.client_timeout) or
+        raise Yahns::ClientTimeout, "waiting for read", []
     when :wait_writable
-      kgio_wait_writable or raise Yahns::ClientTimeout, "waiting for write", []
+      wait_writable(self.class.client_timeout) or
+        raise Yahns::ClientTimeout, "waiting for write", []
     end while true
   end
 
@@ -332,7 +324,6 @@ def do_pread(io, count, offset)
       io.read(count, buf)
     end
   rescue EOFError
-    warn "BUG: do_pread overreach:\n #{caller.join("\n ")}\n"
     nil
   end
 

data/lib/yahns/http_response.rb

@@ -46,10 +46,9 @@ def response_start
     @hs.response_start_sent ? ''.freeze : 'HTTP/1.1 '.freeze
   end
 
-  def response_wait_write(rv)
-    # call the kgio_wait_readable or kgio_wait_writable method
-    ok = __send__("kgio_#{rv}") and return ok
+  def response_wait_write(rv) # rv = [:wait_writable | :wait_readable ]
     k = self.class
+    ok = __send__(rv, k.client_timeout) and return ok
     k.logger.info("fd=#{fileno} ip=#@kgio_addr timeout on :#{rv} after "\
                   "#{k.client_timeout}s")
     false

data/lib/yahns/queue_kqueue.rb

@@ -17,12 +17,6 @@ class Yahns::Queue < SleepyPenguin::Kqueue::IO # :nodoc:
 
   ADD_ONESHOT = Ev::ADD | Ev::ONESHOT # private
 
-  def self.new
-    rv = super
-    rv.close_on_exec = true
-    rv
-  end
-
   # for HTTP and HTTPS servers, we rely on the io writing to us, first
   # flags: QEV_RD/QEV_WR (usually QEV_RD)
   def queue_add(io, flags)

data/lib/yahns/queue_quitter_pipe.rb

@@ -7,7 +7,6 @@ class Yahns::QueueQuitter # :nodoc:
   attr_reader :to_io
   def initialize
     @reader, @to_io = IO.pipe
-    @to_io.close_on_exec = true
   end
 
   def yahns_step
@@ -22,4 +21,8 @@ def close
     @reader.close
     @to_io.close
   end
+
+  def closed?
+    @to_io.closed?
+  end
 end

data/lib/yahns/server.rb

@@ -476,7 +476,7 @@ def reap_reexec
   end
 
   def sp_sig_handle(alive)
-    @sev.kgio_wait_readable(alive ? nil : 0.01)
+    @sev.wait_readable(alive ? nil : 0.01)
     @sev.yahns_step
     case sig = @sig_queue.shift
     when :QUIT, :TERM, :INT
@@ -500,6 +500,19 @@ def dropping(fdmap)
     if drop_acceptors[0] || fdmap.size > 0
       timeout = @shutdown_expire < Yahns.now ? -1 : @shutdown_timeout
       n = fdmap.desperate_expire(timeout)
+      return false if n == 0 && @listeners.empty? # all done!
+
+      # FIXME: sometimes shutdowns take a long time when using proxy_pass
+      # Still not sure what's going on and it takes a while to reproduce..
+      if timeout == -1
+        @logger.error(
+"exiting on shutdown_timeout=#@shutdown_timeout #{fdmap.size} FD(s) remain"
+        )
+
+        system('lsof', '-n', '-p', "#$$") if RUBY_PLATFORM =~ /linux/
+        return false
+      end
+
       $0 = "yahns quitting, #{n} FD(s) remain"
       true
     else

data/lib/yahns/server_mp.rb

@@ -31,8 +31,6 @@ def worker_atfork_internal(worker)
     # daemon_pipe may be true for non-initial workers
     @daemon_pipe = @daemon_pipe.close if @daemon_pipe.respond_to?(:close)
 
-    srand # in case this pops up again: https://bugs.ruby-lang.org/issues/4338
-
     # The OpenSSL PRNG is seeded with only the pid, and apps with frequently
     # dying workers can recycle pids
     OpenSSL::Random.seed(rand.to_s) if defined?(OpenSSL::Random)
@@ -91,7 +89,7 @@ def join
     @logger.info "master process ready"
     daemon_ready
     begin
-      @sev.kgio_wait_readable
+      @sev.wait_readable
       @sev.yahns_step
       reap_all
       case @sig_queue.shift
@@ -159,7 +157,7 @@ def run_mp_worker(worker)
   def mp_sig_handle(watch, alive)
     # not performance critical
     watch.delete_if { |io| io.to_io.closed? }
-    if r = IO.select(watch, nil, nil, alive ? nil : 0.1)
+    if r = select(watch, nil, nil, alive ? nil : 0.1)
       r[0].each(&:yahns_step)
     end
     case @sig_queue.shift

data/lib/yahns/sigevent_efd.rb

@@ -3,7 +3,6 @@
 # License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 # frozen_string_literal: true
 class Yahns::Sigevent < SleepyPenguin::EventFD # :nodoc:
-  include Kgio::DefaultWaiters
   def self.new
     super(0, :CLOEXEC)
   end

data/lib/yahns/sigevent_pipe.rb

@@ -5,21 +5,24 @@
 class Yahns::Sigevent # :nodoc:
   attr_reader :to_io
   def initialize
-    @to_io, @wr = Kgio::Pipe.new
-    @to_io.close_on_exec = @wr.close_on_exec = true
+    @to_io, @wr = IO.pipe
   end
 
-  def kgio_wait_readable(*args)
-    @to_io.kgio_wait_readable(*args)
+  def wait_readable(*args)
+    @to_io.wait_readable(*args)
+  end
+
+  def fileno
+    @to_io.fileno
   end
 
   def sev_signal
-    @wr.kgio_trywrite(".")
+    @wr.write_nonblock(".", exception: false)
   end
 
   def yahns_step
     # 11 byte strings -> no malloc on YARV
-    while String === @to_io.kgio_tryread(11)
+    while String === @to_io.read_nonblock(11, exception: false)
     end
     :wait_readable
   end
@@ -28,4 +31,8 @@ def close
     @to_io.close
     @wr.close
   end
+
+  def closed?
+    @to_io.closed?
+  end
 end

data/lib/yahns/socket_helper.rb

@@ -19,7 +19,7 @@ def so_reuseport
 
   def set_server_sockopt(sock, opt)
     opt = {backlog: 1024}.merge!(opt)
-    sock.close_on_exec = true
+    sock.close_on_exec = true # needed for inherited sockets
 
     TCPSocket === sock and sock.setsockopt(:IPPROTO_TCP, :TCP_NODELAY, 1)
     sock.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, 1)

data/lib/yahns/wbuf.rb

@@ -31,6 +31,7 @@
 class Yahns::Wbuf # :nodoc:
   include Yahns::WbufCommon
   attr_reader :busy
+  IO_WRITEV = RUBY_VERSION.to_r >= 2.5 # IO#write uses writev
 
   def initialize(body, persist)
     @tmpio = nil
@@ -40,9 +41,15 @@ def initialize(body, persist)
     @busy = false
   end
 
-  def wbuf_writev(buf)
-    @tmpio.kgio_writev(buf)
-    buf.inject(0) { |n, s| n += s.size }
+  if IO_WRITEV
+    def wbuf_writev(buf)
+      @tmpio.write(*buf)
+    end
+  else
+    def wbuf_writev(buf)
+      @tmpio.kgio_writev(buf)
+      buf.inject(0) { |n, s| n += s.size }
+    end
   end
 
   def wbuf_write(c, buf)

data/lib/yahns/worker.rb

@@ -9,6 +9,14 @@ class Yahns::Worker # :nodoc:
   def initialize(nr)
     @nr = nr
     @to_io, @wr = Kgio::Pipe.new
+
+    begin
+      # F_SETPIPE_SZ = 1031, PAGE_SIZE = 4096
+      # (fcntl will handle minimum size on platforms where PAGE_SIZE > 4096)
+      @to_io.fcntl(1031, 4096)
+    rescue Errno::EINVAL
+      # old kernel
+    end if RUBY_PLATFORM =~ /\blinux\b/
   end
 
   def atfork_child

data/test/helper.rb

@@ -125,7 +125,7 @@ def nread
 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)

data/test/server_helper.rb

@@ -52,9 +52,7 @@ def quit_wait(pid)
   # 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

data/test/test_bin.rb

@@ -99,7 +99,10 @@ def bin_daemon(worker, inherit)
       # 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)

data/test/test_extras_exec_cgi.rb

@@ -170,7 +170,7 @@ def _blocked_zombie(block_on, rtype)
         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 @@ def _blocked_zombie(block_on, rtype)
     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_serve_static.rb

@@ -38,7 +38,6 @@ def test_serve_static
 
     # ensure sendfile works on Unix sockets
     s = UNIXSocket.new(sock)
-    s.close_on_exec = true
     s.write "GET /COPYING\r\n\r\n"
     assert_equal gplv3, Timeout.timeout(30) { s.read }
     s.close

data/test/test_server.rb

@@ -182,7 +182,6 @@ def test_check_client_connection
     tmpdir = yahns_mktmpdir
     sock = "#{tmpdir}/sock"
     unix_srv = UNIXServer.new(sock)
-    unix_srv.close_on_exec = true
     msgs = %w(ZZ zz)
     err = @err
     cfg = Yahns::Config.new
@@ -234,7 +233,6 @@ def a.each
     bpipe[0].close
     a = UNIXSocket.new(sock)
     b = UNIXSocket.new(sock)
-    b.close_on_exec = a.close_on_exec = true
     a.write("GET /sleep HTTP/1.0\r\n\r\n")
     r = IO.select([a], nil, nil, 4)
     assert r, "nothing ready"
@@ -681,7 +679,6 @@ def test_errors
     assert_equal "INFO HIHI\n", re.read
 
     c = UNIXSocket.new(sock)
-    c.close_on_exec = true
     c.write "GET /\r\n\r\n"
     assert_equal c, c.wait(30)
     assert_equal "OK", c.read

data/test/test_unix_socket.rb

@@ -12,9 +12,7 @@ class TestUnixSocket < Testcase
   def unix_socket(path)
     Timeout.timeout(30) do
       begin
-        c = UNIXSocket.new(path)
-        c.close_on_exec = true
-        return c
+        return UNIXSocket.new(path)
       rescue Errno::ENOENT
         sleep 0.01
         retry

data/test/test_wbuf.rb

@@ -19,7 +19,7 @@ def self.output_buffer_tmpdir
   end
 
   def socketpair
-    KgioUS.pair.each { |io| io.close_on_exec = true }
+    KgioUS.pair
   end
 
   def test_wbuf

data/yahns.gemspec

@@ -28,6 +28,6 @@
   # for Rack::Utils::HeaderHash#each
   s.add_development_dependency(%q<rack>, '>= 1.1')
 
-  s.homepage = 'https://yhbt.net/yahns/README'
+  s.homepage = 'https://yhbt.net/yahns.git/about/'
   s.licenses = "GPL-3.0+"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -222,7 +222,7 @@ files:
 - test/test_unix_socket.rb
 - test/test_wbuf.rb
 - yahns.gemspec
-homepage: https://yhbt.net/yahns/README
+homepage: https://yhbt.net/yahns.git/about/
 licenses:
 - GPL-3.0+
 metadata: {}
@@ -241,8 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server