yahns 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e2b90d1e9db03563036b8fa9d20f734eadbc66b
-  data.tar.gz: da4bfdde14dc21244e1ce59e5696e56bb23d7327
+SHA256:
+  metadata.gz: f5dcbf514b3bf6c9e92c8f0ca7d038019148217ffe6f3a88ab6ea7810333487e
+  data.tar.gz: 4bfd3e6b7a2806daf1e53094050d928a9c28cd1b330ef594a118c2b6bd9d7c86
 SHA512:
-  metadata.gz: b7f796332d347e087508c0ddd7fbba45567e2c51fdc1b9718b911ca03b058c111131e399f0779c8c28abb950197a3cc7e057e5fcee1577c9e32367173486188a
-  data.tar.gz: b12c67cec9e1d9b6f752dc0282d0de9609e72074f2210bc54b68e4b6e47447ae238887aa6a87fcde6d95912ff86f54f9a9617c3d0596411fdba4101b408715cb
+  metadata.gz: 7f8123dcd0921c5c224bdb76009c7d7b1e751da62e2f30690ab438f959e234710afdb1f1b57ecfe64dc8b437ac782f95b69348c7177ecfe1e302173bc494574a
+  data.tar.gz: 7f0e74b4271f4ec44bd2b800b0eb6fa4a570ecd538cf42f79c31ddf92c2552d98bade3a9396d8fd02ba9e16a2f145eb2a028b9050b01e931f90f42adcbf1767a

data/Documentation/yahns-rackup.pod

@@ -40,6 +40,10 @@ and PATH is meant to be a path to a UNIX domain socket.
 Defaults to "0.0.0.0:9292" (all addresses on TCP port 9292).
 Multiple addresses may be separated with commas.
 
+For systemd users, a special value of "inherit" may be specified
+to inherit FDs using the LISTEN_FDS and LISTEN_PID environment
+variables described in L<sd_listen_fds(3)>
+
 =item -O stderr_path=PATHNAME
 
 Allow redirecting $stderr to a given path.  Unlike doing this from

data/Documentation/yahns_config.pod

@@ -656,7 +656,7 @@ compatibility.
 
 See the examples/ directory in the git source tree.
 
-  git clone git://yhbt.net/yahns.git
+  git clone https://yhbt.net/yahns.git
 
 =head1 CONTACT
 

data/GIT-VERSION-GEN

@@ -5,7 +5,7 @@
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.15.0"
+DEF_VER = "v1.16.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 git://yhbt.net/yahns
+	git clone https://yhbt.net/yahns
 
 tests
 -----

data/README

@@ -85,7 +85,7 @@ Hacking
 We use git and follow the same development model as git itself
 (mailing list-oriented, benevolent dictator).
 
-	git clone git://yhbt.net/yahns
+	git clone https://yhbt.net/yahns
 
 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

@@ -56,7 +56,7 @@ def call(env)
     case env["REQUEST_METHOD"]
     when "GET", "HEAD"
       # try to serve the static file, first
-      status, headers, body = res = @app.call(env)
+      status, _, body = res = @app.call(env)
       return res if status.to_i != 404
 
       path_info = env["PATH_INFO"]
@@ -78,7 +78,7 @@ def call(env)
       tryenv = env.dup
       @index.each do |base|
         tryenv["PATH_INFO"] = "#{path_info}#{base}"
-        status, headers, body = res = @app.call(tryenv)
+        status, _, body = res = @app.call(tryenv)
         return res if status.to_i != 404
       end
 

data/lib/yahns/acceptor.rb

@@ -24,7 +24,7 @@ def ac_quit
       close
       return true
     end
-    @thrs.each { |t| t[:yahns_quit] = true }
+    @quit = true
     return true if __ac_quit_done?
 
     @thrs.each do
@@ -42,10 +42,10 @@ def ac_quit
   end
 
   def spawn_acceptor(nr, logger, client_class)
+    @quit = false
     @thrs = nr.times.map do
       Thread.new do
         queue = client_class.queue
-        t = Thread.current
         accept_flags = Kgio::SOCK_NONBLOCK | Kgio::SOCK_CLOEXEC
         qev_flags = client_class.superclass::QEV_FLAGS
         begin
@@ -64,7 +64,7 @@ def spawn_acceptor(nr, logger, client_class)
           sleep 1 # let other threads do some work
         rescue => e
           Yahns::Log.exception(logger, "accept loop", e)
-        end until t[:yahns_quit]
+        end until @quit
       end
     end
   end

data/lib/yahns/config.rb

@@ -328,8 +328,8 @@ def app(type, *args, &block)
         "#{var}: #{file} did not register #{type} in #{self.class}::APP_CLASS"
 
     # apps may have multiple configurator contexts
-    app = @app_instances[klass.instance_key(*args)] = klass.new(*args)
-    ctx = app.config_context
+    app_cfg = @app_instances[klass.instance_key(*args)] = klass.new(*args)
+    ctx = app_cfg.config_context
     if block_given?
       @block = CfgBlock.new(:app, ctx)
       instance_eval(&block)
@@ -438,4 +438,9 @@ def commit!(server)
 
     @app_ctx.each { |app| app.logger ||= server.logger }
   end
+
+  def register_inherited(name)
+    return unless @config_listeners.empty? && @app_ctx.size == 1
+    @config_listeners[name] = { :yahns_app_ctx => @app_ctx[0] }
+  end
 end

data/lib/yahns/http_client.rb

@@ -298,10 +298,18 @@ def handle_error(e)
     when Unicorn::HttpParserError # try to tell the client they're bad
       400
     else
+      n = 500
+      case e.class.to_s
+      when 'OpenSSL::SSL::SSLError'
+        if e.message.include?('wrong version number')
+          n = nil
+          e.set_backtrace([])
+        end
+      end
       Yahns::Log.exception(@hs.env["rack.logger"], "app error", e)
-      500
+      n
     end
-    kgio_trywrite(err_response(code))
+    kgio_trywrite(err_response(code)) if code
   rescue
   ensure
     shutdown rescue nil
@@ -314,12 +322,23 @@ def app_hijacked?(env, res)
     true
   end
 
-  def trysendio(io, offset, count)
-    return 0 if count == 0
+  def do_pread(io, count, offset)
     count = 0x4000 if count > 0x4000
     buf = Thread.current[:yahns_sfbuf] ||= ''.dup
-    io.pos = offset
-    str = io.read(count, buf) or return # nil for EOF
+    if io.respond_to?(:pread)
+      io.pread(count, offset, buf)
+    else
+      io.pos = offset
+      io.read(count, buf)
+    end
+  rescue EOFError
+    warn "BUG: do_pread overreach:\n #{caller.join("\n ")}\n"
+    nil
+  end
+
+  def trysendio(io, offset, count)
+    return 0 if count == 0
+    str = do_pread(io, count, offset) or return # nil for EOF
     n = 0
     case rv = kgio_trywrite(str)
     when String # partial write, keep trying

data/lib/yahns/openssl_client.rb

@@ -40,15 +40,31 @@ def yahns_init_ssl(ssl_ctx)
   def kgio_trywrite(buf)
     len = buf.bytesize
     return if len == 0
-    buf = @ssl_blocked = buf.dup
+
+    case @ssl_blocked
+    when nil # likely
+      buf = @ssl_blocked = buf.dup
+    when Exception
+      raise @ssl_blocked
+    when String
+      if @ssl_blocked != buf
+        pfx = object_id
+        warn("#{pfx} BUG: ssl_blocked != buf\n" \
+             "#{pfx} ssl_blocked=#{@ssl_blocked.inspect}\n" \
+             "#{pfx} buf=#{buf.inspect}\n")
+        raise 'BUG: ssl_blocked} != buf'
+      end
+    end
+
     case rv = @ssl.write_nonblock(buf, exception: false)
     when :wait_readable, :wait_writable
-      return rv # do not clear ssl_blocked
+      rv # do not clear ssl_blocked
     when Integer
-      rv = len == rv ? nil : buf.byteslice(rv, len - rv)
+      @ssl_blocked = len == rv ? nil : buf.byteslice(rv, len - rv)
     end
-    @ssl_blocked = nil
-    rv
+  rescue SystemCallError => e # ECONNRESET/EPIPE
+    e.set_backtrace([])
+    raise(@ssl_blocked = e)
   end
 
   def kgio_trywritev(buf)
@@ -75,22 +91,28 @@ def kgio_tryread(len, buf)
   def trysendio(io, offset, count)
     return 0 if count == 0
 
-    unless buf = @ssl_blocked
-      count = 0x4000 if count > 0x4000
-      buf = Thread.current[:yahns_sfbuf] ||= ''.dup
-      io.pos = offset
-      buf = io.read(count, buf) or return # nil for EOF
+    case buf = @ssl_blocked
+    when nil
+      buf = do_pread(io, count, offset) or return # nil for EOF
       buf = @ssl_blocked = buf.dup
+    when Exception
+      raise buf
+    # when String # just use it as-is
     end
 
     # call write_nonblock directly since kgio_trywrite allocates
     # an unnecessary string
+    len = buf.size
     case rv = @ssl.write_nonblock(buf, exception: false)
     when :wait_readable, :wait_writable
       return rv # do not clear ssl_blocked
+    when Integer
+      @ssl_blocked = len == rv ? nil : buf.byteslice(rv, len - rv)
     end
-    @ssl_blocked = nil
     rv
+  rescue SystemCallError => e # ECONNRESET/EPIPE
+    e.set_backtrace([])
+    raise(@ssl_blocked = e)
   end
 
   def shutdown # we never call this with a how=SHUT_* arg

data/lib/yahns/proxy_pass.rb

@@ -57,7 +57,7 @@ def init_path_vars(path)
   def call(env)
     # 3-way handshake for TCP backends while we generate the request header
     rr = Yahns::ReqRes.start(@sockaddr)
-    c = env['rack.hijack'].call
+    c = env['rack.hijack'].call # Yahns::HttpClient#call
 
     req = Rack::Request.new(env)
     req = @path.gsub(/\$(\w+)/) { req.__send__($1) }

data/lib/yahns/rackup_handler.rb

@@ -16,14 +16,10 @@ def self.run(app, o)
       # fine for most apps, but we have SIGUSR2 restarts to support
       working_directory(Yahns::START[:cwd])
 
-      app(:rack, app) do
+      app(:rack, app) do # Yahns::Config#app
         addr = o[:listen] || "#{o[:Host]||default_host}:#{o[:Port]||8080}"
-        # allow listening to multiple addresses
-        if addr.include?(',')
-          addr.split(',').each { |l| listen(l) }
-        else
-          listen addr
-        end
+        # allow listening to multiple addresses (Yahns::Config#listen)
+        addr.split(',').each { |l| listen(l) } unless addr == 'inherit'
 
         val = o[:client_timeout] and client_timeout(val)
       end

data/lib/yahns/server.rb

@@ -237,24 +237,23 @@ def reexec
       end
     end
 
-    # We cannot use Process.spawn here because of redirects + close-on-exec
-    # We must keep close_on_exec=true in the parent process and only set
-    # close_on_exec=false in the child.  There must be no opportunity
-    # for the user app to ever get a listen socket with close_on_exec=false
-    @reexec_pid = fork do
-      redirects = {}
-      @listeners.each do |sock|
-        sock.close_on_exec = false
-        redirects[sock.fileno] = sock
+    opt = {}
+    @listeners.each { |sock| opt[sock.fileno] = sock }
+    env = ENV.to_hash
+    env['YAHNS_FD'] = opt.keys.join(',')
+    opt[:close_others] = true
+    cmd = [ Yahns::START[0] ].concat(Yahns::START[:argv])
+    dir = @config.value(:working_directory) || Yahns::START[:cwd]
+    @logger.info "spawning #{cmd.inspect} (in #{dir})"
+    @reexec_pid = if @before_exec
+      fork do
+        Dir.chdir(dir)
+        @before_exec.call(cmd)
+        exec(env, *cmd, opt)
       end
-      ENV['YAHNS_FD'] = redirects.keys.join(',')
-      redirects[:close_others] = true
-      Dir.chdir(@config.value(:working_directory) || Yahns::START[:cwd])
-      cmd = [ Yahns::START[0] ].concat(Yahns::START[:argv])
-      @logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
-      @before_exec.call(cmd) if @before_exec
-      cmd << redirects
-      exec(*cmd)
+    else
+      opt[:chdir] = dir
+      spawn(env, *cmd, opt)
     end
   end
 
@@ -328,7 +327,9 @@ def inherit_listeners!
       opts = sock_opts(io)
       io = server_cast(io, opts)
       set_server_sockopt(io, opts)
-      @logger.info "inherited addr=#{sock_name(io)} fd=#{io.fileno}"
+      name = sock_name(io)
+      @logger.info "inherited addr=#{name} fd=#{io.fileno}"
+      @config.register_inherited(name)
       io
     end
 
@@ -395,7 +396,9 @@ def fdmap_init
 
         # call OpenSSL::SSL::SSLContext#setup explicitly here to detect
         # errors and avoid race conditions.  We avoid calling this in the
-        # parent process since
+        # parent process (if we have multiple workers) in case the
+        # setup code starts TCP connections to memcached or similar
+        # for session caching.
         ssl_ctx.setup
       end
       ctx_list << ctx
@@ -451,7 +454,7 @@ def quit_finish
     @queues.each(&:close).clear
 
     # we must not let quitter get GC-ed if we have any worker threads leftover
-    @wthr.each { |t| t[:yahns_quitter] = quitter }
+    @quitter = quitter
 
     quitter.close
   rescue => e

data/test/helper.rb

@@ -136,6 +136,10 @@ def require_exec(cmd)
   false
 end
 
+def xfork
+  GTL.synchronize { fork { yield } }
+end
+
 class DieIfUsed
   @@n = 0
   def each

data/test/server_helper.rb

@@ -31,7 +31,7 @@ def poke_until_dead(pid)
 
   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
@@ -65,16 +65,33 @@ def server_helper_teardown
     @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 @@ def bin_daemon(worker, inherit)
     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
@@ -158,11 +159,10 @@ def usr2_dir(tmpdir, preload, worker)
     # 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 +190,7 @@ def usr2_dir(tmpdir, preload, worker)
     }
     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 @@ def test_initialize
   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 @@ def test_multi_conf_example
   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_try_gzip_static.rb

@@ -52,7 +52,7 @@ def test_gzip_static
       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 @@ def test_mt_accept
     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 @@ def test_mt_accept
     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 'digest'
 begin
   require 'kcar'
+  require 'yahns/proxy_pass'
 rescue LoadError
 end
 
@@ -188,7 +189,6 @@ def test_unix_socket_no_path
     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 @@ def test_proxy_pass
     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 @@ def setup
     @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
 

data/test/test_rack_env.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2017 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+# frozen_string_literal: true
+require_relative 'server_helper'
+require 'rack'
+
+class TestRackEnv < Testcase
+  ENV["N"].to_i > 1 and parallelize_me!
+  include ServerHelper
+  alias setup server_helper_setup
+  alias teardown server_helper_teardown
+
+  def test_rack_env_logger
+    err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
+    cfg.instance_eval do
+      stderr_path err.path
+      GTL.synchronize do
+        app = Rack::Builder.new do
+          use Rack::Lint # ensure Lint passes
+          run(lambda do |env|
+            logger = env['rack.logger']
+            %w(SERVER_NAME SERVER_PORT rack.url_scheme).each do |k|
+              logger.info("#{k}=#{env[k].inspect}")
+            end
+            [ 200, [ %w(Content-Length 3), %w(Content Type text/plain)],
+             [ "OK\n" ] ]
+          end)
+        end
+        app(:rack, app.to_app) { listen "#{host}:#{port}" }
+      end
+    end
+    pid = mkserver(cfg)
+    Net::HTTP.start(host, port) do |http|
+      res = http.request(Net::HTTP::Get.new("/"))
+      assert_equal 200, res.code.to_i
+      assert_equal "OK\n", res.body
+      txt = File.read(err.path)
+      assert_match %r{\srack\.url_scheme=#{Regexp.escape('http'.inspect)}\s}s,
+                   txt
+      assert_match %r{\sSERVER_NAME=#{Regexp.escape(host.inspect)}\s}s, txt
+      assert_match %r{\sSERVER_PORT=#{Regexp.escape(port.to_s.inspect)}\s}s, txt
+    end
+    err.truncate 0
+    err.rewind
+    c = TCPSocket.new(host, port)
+    c.write("GET / HTTP/1.0\r\nHost: example.com\r\n\r\n")
+    assert_match %r{\r\nOK\n\z}s, c.read
+    txt = File.read(err.path)
+    assert_match %r{\srack\.url_scheme=#{Regexp.escape('http'.inspect)}\s}s,
+                 txt
+    assert_match %r{\sSERVER_NAME=#{Regexp.escape('example.com'.inspect)}\s}s,
+                txt
+    assert_match %r{\sSERVER_PORT=#{Regexp.escape('80'.inspect)}\s}s, txt
+  ensure
+    c.close if c
+    quit_wait(pid)
+  end
+end

data/test/test_server.rb

@@ -225,7 +225,7 @@ def a.each
     assert_equal 1, eggs.size
     assert_equal 1, eggs.first[1].instance_variable_get(:@worker_threads)
 
-    pid = fork do
+    pid = xfork do
       bpipe[1].close
       ENV["YAHNS_FD"] = unix_srv.fileno.to_s
       unix_srv.autoclose = false

data/test/test_ssl.rb

@@ -41,6 +41,7 @@ def teardown
   def ssl_client(host, port)
     ctx = OpenSSL::SSL::SSLContext.new
     ctx.ciphers = "ADH"
+    ctx.security_level = 0
     s = TCPSocket.new(host, port)
     ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
     ssl.connect
@@ -51,6 +52,7 @@ def ssl_client(host, port)
   def srv_ctx
     ctx = OpenSSL::SSL::SSLContext.new
     ctx.ciphers = "ADH"
+    ctx.security_level = 0
     ctx.tmp_dh_callback = proc { TEST_KEY_DH1024 }
     ctx
   end

data/yahns.gemspec

@@ -10,6 +10,9 @@
   s.email = %q{yahns-public@yhbt.net}
   s.executables = manifest.grep(%r{\Abin/}).map { |s| s.sub(%r{\Abin/}, "") }
   s.files = manifest
+
+  s.required_ruby_version = '>= 2.0'
+
   s.add_dependency(%q<kgio>, '~> 2.9')
   s.add_dependency(%q<sleepy_penguin>, '~> 3.2')
   s.add_dependency(%q<unicorn>, '>= 4.6.3', '< 6.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -210,6 +210,7 @@ files:
 - test/test_proxy_pass.rb
 - test/test_proxy_pass_no_buffering.rb
 - test/test_rack.rb
+- test/test_rack_env.rb
 - test/test_rack_hijack.rb
 - test/test_reopen_logs.rb
 - test/test_response.rb
@@ -233,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server