yahns 1.14.1 → 1.18.0

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_serve_static.rb

@@ -38,7 +38,6 @@ class TestServeStatic < Testcase
 
     # 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 @@ class TestServer < Testcase
     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
@@ -225,7 +224,7 @@ class TestServer < Testcase
     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
@@ -234,7 +233,6 @@ class TestServer < Testcase
     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 @@ class TestServer < Testcase
     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_ssl.rb

@@ -41,6 +41,7 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
   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 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
   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/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 @@ class TestWbuf < Testcase
   end
 
   def socketpair
-    KgioUS.pair.each { |io| io.close_on_exec = true }
+    KgioUS.pair
   end
 
   def test_wbuf

data/yahns.gemspec

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 Gem::Specification.new do |s|
   manifest = File.read('.gem-manifest').split(/\n/)
   s.name = %q{yahns}
@@ -7,12 +7,15 @@ Gem::Specification.new do |s|
   s.authors = ["yahns hackers"]
   s.summary = "sleepy, multi-threaded, non-blocking application server"
   s.description = File.read("README").split(/\n\n/)[1].strip
-  s.email = %q{yahns@yhbt.net}
+  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')
+  s.add_dependency(%q<unicorn>, '>= 4.6.3', '< 7.0')
   # s.add_dependency(%q<kgio-sendfile>, '~> 1.2') # optional
 
   # minitest is standard in Ruby 2.0, 4.3 is packaged with Ruby 2.0.0,
@@ -25,6 +28,6 @@ Gem::Specification.new do |s|
   # 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.14.1
+  version: 1.18.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -47,7 +47,7 @@ dependencies:
         version: 4.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 4.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -99,13 +99,14 @@ description: |-
   yahns currently hosts Rack/HTTP applications, but may eventually support
   other application types.  Unlike some existing servers, yahns is
   extremely sensitive to fatal bugs in the applications it hosts.
-email: yahns@yhbt.net
+email: yahns-public@yhbt.net
 executables:
 - yahns
 - yahns-rackup
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
 - ".gitattributes"
 - ".gitignore"
 - ".olddoc.yml"
@@ -127,9 +128,11 @@ files:
 - bin/yahns
 - bin/yahns-rackup
 - examples/README
+- examples/https_proxy_pass.conf.rb
 - examples/init.sh
 - examples/logger_mp_safe.rb
 - examples/logrotate.conf
+- examples/proxy_pass.ru
 - examples/yahns.socket
 - examples/yahns@.service
 - examples/yahns_multi.conf.rb
@@ -211,6 +214,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
@@ -222,7 +226,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: {}
@@ -234,15 +238,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server