yahns 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c643fa72cb1ded8e5ce3999d579e12a7076df0b
-  data.tar.gz: 54d4e4b0d98944eacd73fadbdf7d7f508707b6f0
+  metadata.gz: 147b339e7cb3eec02dc6e6e482fe8a08bf5d2ad0
+  data.tar.gz: 56e54e9e277aaa32b642a6f7680d5b899ed208d2
 SHA512:
-  metadata.gz: 7d13c33de59bd992eff2b56855d415bad109f7835039647907f91c64e7ab2e0802fcc09e3dd5c621ebb935c134c93f2f75d58e5f2e8e52c7c6ecff15c6f1c6bd
-  data.tar.gz: 80c8fc880ce803efb7598bac519cb197931c5e39c2330738b5cc40a8fbeffd592f72ee545f9e1527da8c9c7a96301f095d86b53d330fdbe03af34ed0840d6298
+  metadata.gz: d8427b2bdb6a6ae2d0b8bfd445b6bac230cf40e0675d43365e689896aac769d0cafd201a61215ab1075a91e7e8e09ef6797ae7ae9132ae1da20c48f199350622
+  data.tar.gz: 9e015af7565846e6a913d02fed38ff7ebc040779acb53caf6a7fd417c31e9ebe3a054105ecf1c3a19e9671b7ba7d08ecfe53a20adf15fa1fa26cc46fdded23c4

data/Documentation/yahns.txt

@@ -49,6 +49,10 @@ environment variables will also affect it.
 yahns will update the PWD (current working directory) env if the
 working_directory directive is set (see yahns_config(5)).
 
+LISTEN_FDS and LISTEN_PID variables are used in our emulation
+of sd_listen_fds(3) function.   See sd_listen_fds(3) manpage
+for more details.
+
 # FILES
 
 See yahns_config(5) for documentation on the configuration file format.
@@ -65,4 +69,4 @@ License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 
 # SEE ALSO
 
-yahns-rackup(1), yahns_config(5)
+yahns-rackup(1), yahns_config(5), sd_listen_fds(3)

data/GIT-VERSION-FILE

@@ -1 +1 @@
-VERSION = 1.10.0
+VERSION = 1.11.0

data/GIT-VERSION-GEN

@@ -4,7 +4,7 @@
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.10.0"
+DEF_VER = "v1.11.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/NEWS

@@ -1,3 +1,19 @@
+=== yahns 1.11.0 - more minor updates / 2015-12-13 02:20 UTC
+
+  There's some minor test case fixes and documentation updates.
+
+  For OpenSSL users running the Ruby 2.3.0 preview releases,
+  we now use `exception: false' for for accept_nonblock to reduce
+  exceptions.  Non-SSL I/O still uses kgio for now.
+
+  6 changes since 1.10.0:
+        wbuf: fix typo in bug check for sendfile gem
+        test_wbuf: deal with proper zero-copy for Unix sockets
+        README: clarify and update copyright year
+        doc: document and reference sd_listen_fds(3) behavior
+        test_server: fix race condition in hooks test
+        openssl_client: use `exception: false' for accept_nonblock
+
 === yahns 1.10.0 - minor updates / 2015-11-01 09:08 UTC
 
   * test_client_expire: favor Process.spawn over fork+exec

data/README

@@ -55,19 +55,17 @@ 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 public inbox/mailing list at:
+and pull requests to the open-to-all mailing list at:
 
 	yahns-public@yhbt.net
 
 No subscription is necessary to post.  Please Cc: all recipients as
 subscription is not necessary.
 
-You may subscribe by sending an email to:
+You may optionally subscribe by sending an email to:
 
 	yahns-public+subscribe@yhbt.net
 
-You may also subscribe to the public-inbox at git://yhbt.net/yahns-public
-using ssoma <http://ssoma.public-inbox.org/>
 Mailing list archives browsable via HTTP: http://yhbt.net/yahns-public/
 Or NNTP: nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
 
@@ -127,7 +125,7 @@ processes to work around low FD limits as well as contention in the:
 Copyright
 ---------
 
-Copyright 2013-2014, all contributors (see git repo).
+Copyright 2013-2015, all contributors (see git repo).
 License: GPLv3 or later <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 yahns is copyrighted Free Software by all contributors, see logs in

data/lib/yahns/openssl_client.rb

@@ -53,14 +53,9 @@ module Yahns::OpenSSLClient # :nodoc:
     if @need_accept
       # most protocols require read before write, so we start the negotiation
       # process here:
-      begin
-        @ssl.accept_nonblock
-      rescue IO::WaitReadable
-        return :wait_readable
-      rescue IO::WaitWritable
-        return :wait_writable
-      rescue OpenSSL::SSL::SSLError
-        return nil
+      case rv = accept_nonblock(@ssl)
+      when :wait_readable, :wait_writable, nil
+        return rv
       end
       @need_accept = false
     end
@@ -71,4 +66,20 @@ module Yahns::OpenSSLClient # :nodoc:
     @ssl.close # flushes SSLSocket
     super # IO#close
   end
+
+  if RUBY_VERSION.to_f >= 2.3
+    def accept_nonblock(ssl)
+      ssl.accept_nonblock(exception: false)
+    end
+  else
+    def accept_nonblock(ssl)
+      ssl.accept_nonblock
+    rescue IO::WaitReadable
+      :wait_readable
+    rescue IO::WaitWritable
+      :wait_writable
+    rescue OpenSSL::SSL::SSLError
+      nil
+    end
+  end
 end

data/lib/yahns/version.rb

@@ -1 +1 @@
-Yahns::VERSION = '1.10.0' # :nodoc:
+Yahns::VERSION = '1.11.0' # :nodoc:

data/lib/yahns/wbuf.rb

@@ -71,7 +71,7 @@ class Yahns::Wbuf # :nodoc:
       @busy = rv
       return rv
     else
-      raise "BUG: #{rv.nil ? "EOF" : rv.inspect} on tmpio " \
+      raise "BUG: #{rv.nil? ? "EOF" : rv.inspect} on tmpio " \
             "sf_offset=#@sf_offset sf_count=#@sf_count"
     end while @sf_count > 0
 

data/man/yahns.1

@@ -53,6 +53,10 @@ also affect it.
 .PP
 yahns will update the PWD (current working directory) env if the
 working_directory directive is set (see yahns_config(5)).
+.PP
+LISTEN_FDS and LISTEN_PID variables are used in our emulation of
+sd_listen_fds(3) function.
+See sd_listen_fds(3) manpage for more details.
 .SH FILES
 .PP
 See yahns_config(5) for documentation on the configuration file format.
@@ -69,4 +73,4 @@ Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 .SH SEE ALSO
 .PP
-yahns-rackup(1), yahns_config(5)
+yahns-rackup(1), yahns_config(5), sd_listen_fds(3)

data/test/test_server.rb

@@ -433,7 +433,7 @@ class TestServer < Testcase
       stderr_path err.path
       stdout_path out.path
     end
-    pid = mkserver(cfg)
+    master_pid = pid = mkserver(cfg)
     c = get_tcp_client(host, port)
     c.write("GET / HTTP/1.0\r\nHost: example.com\r\n\r\n")
     buf = Timeout.timeout(10) { c.read }
@@ -442,19 +442,24 @@ class TestServer < Testcase
     assert_match(/200 OK/, head)
     assert_match(/\A\d+\z/, body)
     worker_pid = body.to_i
+
+    # ensure atfork_parent has run
+    quit_wait(master_pid)
+    master_pid = nil
+
     lines = out.readlines.map!(&:chomp!)
     out.close!
 
     assert_match %r{INFO hihi from app\.atfork_child}, File.read(err.path)
 
-    assert_equal 3, lines.size
+    assert_equal 3, lines.size, lines.join("\n")
     assert_equal("af #{pid} parent about to spawn", lines.shift)
 
     # child/parent ordering is not guaranteed
     assert_equal 1, lines.grep(/\Aaf #{pid} this is probably not useful\z/).size
     assert_equal 1, lines.grep(/\Aaf #{worker_pid} worker is running\z/).size
   ensure
-    quit_wait(pid)
+    quit_wait(master_pid)
   end
 
   def test_mp_hooks_worker_nr

data/test/test_wbuf.rb

@@ -71,8 +71,17 @@ class TestWbuf < Testcase
       end while true
     end
     wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir, :wait_writable)
-    assert_equal :wait_writable, wbuf.wbuf_write(a, buf)
-    assert_equal :wait_writable, wbuf.wbuf_flush(a)
+
+    rv1 = wbuf.wbuf_write(a, buf)
+    rv2 = wbuf.wbuf_flush(a)
+    case rv1
+    when nil
+      assert_equal true, rv2, 'some kernels succeed with real sendfile'
+    when :wait_writable
+      assert_equal :wait_writable, rv2, 'some block on sendfile'
+    else
+      flunk "unexpected from wbuf_write/flush: #{rv1.inspect} / #{rv2.inspect}"
+    end
 
     # drain the buffer
     Timeout.timeout(10) { b.read(b.nread) until b.nread == 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server