yahns 1.12.5 → 1.13.0

data/test/test_server.rb

@@ -725,6 +725,41 @@ class TestServer < Testcase
     assert_nil c.read(666)
   end
 
+  def test_slow_shutdown_timeout; _slow_shutdown(nil); end
+  def test_slow_shutdown_timeout_mp; _slow_shutdown(1); end
+
+  def _slow_shutdown(nr_workers)
+    err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
+    pid = mkserver(cfg) do
+      ru = lambda { |e| [ 200, {'Content-Length'=>'2'}, %w(OK) ] }
+      cfg.instance_eval do
+        app(:rack, ru) { listen "#{host}:#{port}" }
+        stderr_path err.path
+        worker_processes(nr_workers) if nr_workers
+      end
+    end
+    c = get_tcp_client(host, port)
+    c.write 'G'
+    100000.times { Thread.pass }
+    Process.kill(:QUIT, pid)
+    "ET / HTTP/1.1\r\nHost: example.com\r\n\r\n".each_byte do |x|
+      Thread.pass
+      c.write(x.chr)
+      Thread.pass
+    end
+    assert_equal c, c.wait(30)
+    buf = ''.dup
+    re = /\r\n\r\nOK\z/
+    Timeout.timeout(30) do
+      begin
+        buf << c.readpartial(666)
+      end until re =~ buf
+    end
+    c.close
+    _, status = Timeout.timeout(5) { Process.waitpid2(pid) }
+    assert status.success?, status.inspect
+  end
+
   def test_before_exec
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
     ru = lambda { |e| [ 200, {'Content-Length'=>'2' }, %w(OK) ] }

data/test/test_ssl.rb

@@ -26,12 +26,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
 -----END DH PARAMETERS-----
   _end_of_pem_
 
-  TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41" \
-     "E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2" \
-     "CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB4" \
-     "51E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672E" \
-     "EF3EF13AB47A15275FC2836F3AC74CEA", 16)
-
   def setup
     unless FAST_NB
       skip "missing exception-free non-blocking IO in " \

data/test/test_tmpio.rb

@@ -5,6 +5,10 @@
 require_relative 'helper'
 
 class TestTmpIO < Testcase
+  def setup
+    skip 'sendfile missing' unless IO.instance_methods.include?(:sendfile)
+  end
+
   def test_writev
     a, b = UNIXSocket.pair
     a.extend Kgio::PipeMethods

data/test/test_wbuf.rb

@@ -7,8 +7,15 @@ require 'timeout'
 class TestWbuf < Testcase
   ENV["N"].to_i > 1 and parallelize_me!
 
+  def setup
+    skip 'sendfile missing' unless IO.instance_methods.include?(:sendfile)
+  end
+
   class KgioUS < UNIXSocket
     include Kgio::SocketMethods
+    def self.output_buffer_tmpdir
+      Dir.tmpdir
+    end
   end
 
   def socketpair
@@ -20,8 +27,8 @@ class TestWbuf < Testcase
     buf = "*" * (16384 * 2)
     nr = 1000
     [ true, false ].each do |persist|
-      wbuf = Yahns::Wbuf.new([], persist, Dir.tmpdir, :wait_writable)
-      assert_equal :wait_writable, wbuf.busy
+      wbuf = Yahns::Wbuf.new([], persist)
+      assert_equal false, wbuf.busy
       a, b = socketpair
       assert_nil wbuf.wbuf_write(a, "HIHI")
       assert_equal "HIHI", b.read(4)
@@ -71,7 +78,7 @@ class TestWbuf < Testcase
         break
       end while true
     end
-    wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir, :wait_writable)
+    wbuf = Yahns::Wbuf.new([], true)
 
     rv1 = wbuf.wbuf_write(a, buf)
     rv2 = wbuf.wbuf_flush(a)
@@ -104,7 +111,7 @@ class TestWbuf < Testcase
   def test_wbuf_flush_close
     pipe = cloexec_pipe
     persist = true
-    wbuf = Yahns::Wbuf.new(pipe[0], persist, Dir.tmpdir, :wait_writable)
+    wbuf = Yahns::Wbuf.new(pipe[0], persist)
     refute wbuf.respond_to?(:close) # we don't want this for HttpResponse body
     sp = socketpair
     rv = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.13.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -130,6 +130,8 @@ files:
 - examples/init.sh
 - examples/logger_mp_safe.rb
 - examples/logrotate.conf
+- examples/yahns.socket
+- examples/yahns@.service
 - examples/yahns_multi.conf.rb
 - examples/yahns_rack_basic.conf.rb
 - extras/README
@@ -140,6 +142,7 @@ files:
 - lib/yahns.rb
 - lib/yahns/acceptor.rb
 - lib/yahns/cap_input.rb
+- lib/yahns/chunk_body.rb
 - lib/yahns/client_expire_generic.rb
 - lib/yahns/client_expire_tcpi.rb
 - lib/yahns/config.rb
@@ -164,7 +167,7 @@ files:
 - lib/yahns/queue_quitter_pipe.rb
 - lib/yahns/rack.rb
 - lib/yahns/rackup_handler.rb
-- lib/yahns/sendfile_compat.rb
+- lib/yahns/req_res.rb
 - lib/yahns/server.rb
 - lib/yahns/server_mp.rb
 - lib/yahns/sigevent.rb
@@ -180,6 +183,7 @@ files:
 - lib/yahns/version.rb
 - lib/yahns/wbuf.rb
 - lib/yahns/wbuf_common.rb
+- lib/yahns/wbuf_lite.rb
 - lib/yahns/wbuf_str.rb
 - lib/yahns/worker.rb
 - man/yahns-rackup.1
@@ -188,6 +192,7 @@ files:
 - test/covshow.rb
 - test/helper.rb
 - test/server_helper.rb
+- test/test_auto_chunk.rb
 - test/test_bin.rb
 - test/test_buffer_tmpdir.rb
 - test/test_client_expire.rb
@@ -204,6 +209,7 @@ files:
 - test/test_mt_accept.rb
 - test/test_output_buffering.rb
 - test/test_proxy_pass.rb
+- test/test_proxy_pass_no_buffering.rb
 - test/test_rack.rb
 - test/test_rack_hijack.rb
 - test/test_reopen_logs.rb
@@ -236,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server

data/lib/yahns/sendfile_compat.rb

@@ -1,24 +0,0 @@
-# -*- encoding: binary -*-
-# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
-# frozen_string_literal: true
-
-module Yahns::SendfileCompat # :nodoc:
-  def trysendfile(io, offset, count)
-    return 0 if count == 0
-    count = 0x4000 if count > 0x4000
-    buf = Thread.current[:yahns_sfbuf] ||= ''.dup
-    io.pos = offset
-    str = io.read(count, buf) or return # nil for EOF
-    n = 0
-    case rv = kgio_trywrite(str)
-    when String # partial write, keep trying
-      n += (str.size - rv.size)
-      str = rv
-    when :wait_writable, :wait_readable
-      return n > 0 ? n : rv
-    when nil
-      return n + str.size # yay!
-    end while true
-  end
-end