yahns 1.11.0 → 1.12.0

data/test/test_rack.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'helper'
 require 'rack/lobster'
 require 'yahns/rack'

data/test/test_rack_hijack.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 
 class TestRackHijack < Testcase

data/test/test_reopen_logs.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 require 'rack/commonlogger'
 

data/test/test_response.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 
 class TestResponse < Testcase

data/test/test_serve_static.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative 'server_helper'
 require 'rack/file'
 

data/test/test_server.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 
 class TestServer < Testcase
@@ -25,7 +26,7 @@ def test_single_process
     # test pipelining
     r = "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n"
     c.write(r + r)
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(10) do
       until buf =~ /HI.+HI/m
         buf << c.readpartial(4096)
@@ -34,7 +35,7 @@ def test_single_process
 
     # trickle pipelining
     c.write(r + "GET ")
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(10) do
       until buf =~ /HI\z/
         buf << c.readpartial(4096)
@@ -91,7 +92,7 @@ def input_body(btype)
     buf = "PUT / HTTP/1.1\r\nContent-Length: 2\r\n\r\nHI"
     c = get_tcp_client(host, port)
     c.write(buf + buf)
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(10) do
       until buf =~ /HI.+HI/m
         buf << c.readpartial(4096)
@@ -110,7 +111,7 @@ def input_body(btype)
       sleep(0.01) if b.chr == ":"
       Thread.pass
     end
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(10) do
       until buf =~ /HIBYE.+HIBYE/m
         buf << c.readpartial(4096)
@@ -427,7 +428,7 @@ def test_mp_hooks
         worker_processes(1) do
           atfork_child { puts "af #$$ worker is running" }
           atfork_prepare { puts "af #$$ parent about to spawn" }
-          atfork_parent { puts "af #$$ this is probably not useful" }
+          atfork_parent { puts "af #$$ parent done spawning" }
         end
       }
       stderr_path err.path
@@ -456,7 +457,7 @@ def test_mp_hooks
     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 #{pid} parent done spawning\z/).size
     assert_equal 1, lines.grep(/\Aaf #{worker_pid} worker is running\z/).size
   ensure
     quit_wait(master_pid)
@@ -478,7 +479,7 @@ def test_mp_hooks_worker_nr
         worker_processes(1) do
           atfork_child { |nr| puts "af.#{nr} #$$ worker is running" }
           atfork_prepare { |nr| puts "af.#{nr} #$$ parent about to spawn" }
-          atfork_parent { |nr| puts "af.#{nr} #$$ this is probably not useful" }
+          atfork_parent { |nr| puts "af.#{nr} #$$ parent done spawning" }
         end
       }
       stderr_path err.path
@@ -502,7 +503,7 @@ def test_mp_hooks_worker_nr
 
     # child/parent ordering is not guaranteed
     assert_equal 1,
-        lines.grep(/\Aaf\.0 #{pid} this is probably not useful\z/).size
+        lines.grep(/\Aaf\.0 #{pid} parent done spawning\z/).size
     assert_equal 1,
         lines.grep(/\Aaf\.0 #{worker_pid} worker is running\z/).size
   ensure
@@ -709,7 +710,7 @@ def _persistent_shutdown(nr_workers)
     c = get_tcp_client(host, port)
     c.write "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n"
     assert_equal c, c.wait(30)
-    buf = ""
+    buf = ''.dup
     re = /\r\n\r\nOK\z/
     Timeout.timeout(30) do
       begin
@@ -781,7 +782,7 @@ def test_app_controls_close
 
     # normal response
     c.write "GET /keep-alive HTTP/1.1\r\nHost: example.com\r\n\r\n"
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(30) do
       buf << c.readpartial(4096) until buf =~ /HI\z/
     end
@@ -790,7 +791,7 @@ def test_app_controls_close
 
     # we allow whatever in the response, but don't send it
     c.write "GET /whatever HTTP/1.1\r\nHost: example.com\r\n\r\n"
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(30) do
       buf << c.readpartial(4096) until buf =~ /HI\z/
     end
@@ -798,7 +799,7 @@ def test_app_controls_close
     assert_raises(Errno::EAGAIN,IO::WaitReadable) { c.read_nonblock(666) }
 
     c.write "GET /close HTTP/1.1\r\nHost: example.com\r\n\r\n"
-    buf = ""
+    buf = ''.dup
     Timeout.timeout(30) do
       buf << c.readpartial(4096) until buf =~ /HI\z/
     end

data/test/test_ssl.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2014,  all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 require 'openssl'
 class TestSSL < Testcase
@@ -62,29 +63,79 @@ def srv_ctx
 
   def test_ssl_basic
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
+    insecure = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0)
     ctx = srv_ctx
+    raw = File.read(__FILE__)
     pid = mkserver(cfg) do
+      ENV["YAHNS_FD"] += ",#{insecure.fileno.to_s}"
       cfg.instance_eval do
-        ru = lambda { |_| [ 200, {'Content-Length'=>'2'}, ['HI'] ] }
-        app(:rack, ru) { listen "#{host}:#{port}", ssl_ctx: ctx }
+        ru = lambda do |env|
+          case path_info = env['PATH_INFO']
+          when '/rack.url_scheme', '/HTTPS'
+            s = env[path_info[1..-1]] # remove leading slash
+            s = s.inspect if s.nil?
+            [ 200, {
+                'Content-Length' => s.bytesize.to_s,
+                'Content-Type'=>'text/plain',
+              }, [ s ] ]
+          when '/static'
+            f = File.open(__FILE__)
+            [ 200, {
+                'Content-Length' => f.size.to_s,
+                'Content-Type'=>'text/plain',
+              },
+              f ]
+          else
+            [ 200, {'Content-Length'=>'2'}, ['HI'] ]
+          end
+        end
+        app(:rack, ru) {
+          listen "#{host}:#{port}", ssl_ctx: ctx
+          listen "#{insecure.addr[3]}:#{insecure.addr[1]}"
+        }
         logger(Logger.new(err.path))
       end
     end
     client = ssl_client(host, port)
-    client.write("GET / HTTP/1.1\r\nHost: example.com\r\n\r\n")
-    buf = ''
+    buf = ''.dup
+    { '/' => 'HI',
+      '/rack.url_scheme' => 'https',
+      '/HTTPS' => 'on'
+    }.each do |path, exp|
+      client.write("GET #{path} HTTP/1.1\r\nHost: example.com\r\n\r\n")
+      buf.clear
+      re = /#{Regexp.escape(exp)}\z/
+      Timeout.timeout(60) do
+        buf << client.readpartial(111) until buf =~ re
+      end
+      head, body = buf.split("\r\n\r\n", 2)
+      assert_equal exp, body
+      assert_match %r{\AHTTP/1\.\d 200 OK\r\n}, head
+    end
+
+    Net::HTTP.start(insecure.addr[3], insecure.addr[1]) do |h|
+      res = h.get('/rack.url_scheme')
+      assert_equal 'http', res.body
+      res = h.get('/HTTPS')
+      assert_equal 'nil', res.body
+    end
+
+    # read static file
+    client.write("GET /static HTTP/1.1\r\nHost: example.com\r\n\r\n")
+    buf.clear
     Timeout.timeout(60) do
-      buf << client.readpartial(111) until buf =~ /HI\z/
+      buf << client.readpartial(8192) until buf.include?(raw)
     end
     head, body = buf.split("\r\n\r\n", 2)
-    assert_equal "HI", body
     assert_match %r{\AHTTP/1\.\d 200 OK\r\n}, head
+    assert_equal raw, body
 
     client.write("GET / HTTP/1.0\r\n\r\n")
     head, body = client.read.split("\r\n\r\n", 2)
     assert_equal "HI", body
     assert_match %r{\AHTTP/1\.\d 200 OK\r\n}, head
   ensure
+    insecure.close if insecure
     client.close if client
     quit_wait(pid)
   end
@@ -104,7 +155,7 @@ def test_ssl_hijack
             when "remote_address\n"
               s.puts(s.remote_address.inspect)
             when "each\n"
-              line = ''
+              line = ''.dup
               s.each do |l|
                 l.strip!
                 line << l

data/test/test_stream_file.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'helper'
 require 'timeout'
 

data/test/test_tmpio.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2009-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2009-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-2.0.txt)
+# frozen_string_literal: true
 require_relative 'helper'
 
 class TestTmpIO < Testcase

data/test/test_unix_socket.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'server_helper'
 
 class TestUnixSocket < Testcase

data/test/test_wbuf.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# 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
 require_relative 'helper'
 require 'timeout'
 

data/yahns.gemspec

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 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}
@@ -22,6 +22,9 @@
   # Matz Ruby release.
   s.add_development_dependency(%q<minitest>, '>= 4.3', '< 6.0')
 
+  # for Rack::Utils::HeaderHash#each
+  s.add_development_dependency(%q<rack>, '>= 1.1')
+
   s.homepage = "http://yahns.yhbt.net/README"
   s.licenses = "GPL-3.0+"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -78,6 +78,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: |-
   A Free Software, multi-threaded, non-blocking network application server
   designed for low _idle_ power consumption.  It is primarily optimized
@@ -92,15 +106,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".olddoc.yml"
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
 - Documentation/design_notes.txt
-- Documentation/yahns-rackup.txt
-- Documentation/yahns.txt
-- Documentation/yahns_config.txt
+- Documentation/yahns-rackup.pod
+- Documentation/yahns.pod
+- Documentation/yahns_config.pod
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
@@ -221,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server

data/Documentation/yahns-rackup.txt

@@ -1,152 +0,0 @@
-% yahns-rackup(1) yahns user manual
-
-# NAME
-
-yahns-rackup - a rackup-like command to launch yahns
-
-# SYNOPSIS
-
-yahns-rackup [-E RACK_ENV] [-O worker_threads=NUM] [RACKUP_FILE]
-
-# DESCRIPTION
-
-A rackup(1)-like command to launch Rack applications using yahns.
-It is expected to start in your application root (APP_ROOT).
-
-# RACKUP FILE
-
-This defaults to \"config.ru\" in APP_ROOT.  It should be the same
-file used by rackup(1) and other Rack launchers, it uses the
-*Rack::Builder* DSL.
-
-# YAHNS OPTIONS
--O client_timeout=SECONDS
-:   Defines the timeout expiring idle connections.
-
-    Increase this if your application takes longer to run than the
-    default timeout.  Lower this if you run out of FDs.
-
-    Default: 15 (seconds)
-
--O listen=ADDRESS[,ADDRESS...]
-:   Listens on a given ADDRESS.  ADDRESS may be in the form of
-    HOST:PORT or PATH, HOST:PORT is taken to mean a TCP socket
-    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.
-
--O stderr_path=PATHNAME
-:   Allow redirecting $stderr to a given path.  Unlike doing this from
-    the shell, this allows the yahns process to know the path its
-    writing to and rotate the file if it is used for logging.  The
-    file will be opened with the O_APPEND flag and writes
-    synchronized to the kernel (but not necessarily to _disk_) so
-    multiple processes can safely append to it.
-
-    If you are daemonizing and using the default logger, it is important
-    to specify this as errors will otherwise be lost to /dev/null.
-    Some applications/libraries may also triggering warnings that go to
-    stderr, and they will end up here.
-
-    Default: /dev/null if daemonized, controlling terminal if not
-
--O stdout_path=PATH
-:   Same as stderr_path, except for $stdout.  Not many applications
-    write to $stdout, but any that do will have their output written here.
-    It is safe to point this to the same location a stderr_path.
-    Like stderr_path, this defaults to /dev/null when daemonized.
-
-    Default: /dev/null if daemonized, controlling terminal if not
-
--O worker_threads=INTEGER
-:   This controls the number of threads for application processing.
-    Each queue has its own thread pool.  Increase this number if your
-    applications are able to use more threads effectively or if either
-    (or both) input/output buffering are disabled.  Lower this number if
-    you do not need multi-thread concurrency at all.
-
-    Default: 7
-
-# RACKUP OPTIONS
--D, \--daemonize
-:   Run daemonized in the background.  The process is detached from
-    the controlling terminal and stdin is redirected to /dev/null.
-    Unless specified via stderr_path and stdout_path, stderr and stdout will
-    also be redirected to "/dev/null".
-
--E, \--env RACK_ENV
-:   Run under the given RACK_ENV.  See the RACK ENVIRONMENT section
-    for more details.
-
--o, \--host HOST
-:   Listen on a TCP socket belonging to HOST, default is
-    "0.0.0.0" (all addresses).
-    If specified multiple times on the command-line, only the
-    last-specified value takes effect.
-    This option only exists for compatibility with the rackup(1) command,
-    use of "-l"/"\--listen" switch is recommended instead.
-
--p, \--port PORT
-:   Listen on the specified TCP PORT, default is 9292.
-    If specified multiple times on the command-line, only the last-specified
-    value takes effect.
-    This option only exists for compatibility with the rackup(1) command,
-    use of "-l"/"\--listen" switch is recommended instead.
-
-# RUBY OPTIONS
--e, \--eval LINE
-:   Evaluate a LINE of Ruby code.  This evaluation happens
-    immediately as the command-line is being parsed.
-
--d, \--debug
-:   Turn on debug mode, the $DEBUG variable is set to true.
-
--w, \--warn
-:   Turn on verbose warnings, the $VERBOSE variable is set to true.
-
--I, \--include PATH
-:   specify $LOAD_PATH.  PATH will be prepended to $LOAD_PATH.
-    The \':\' character may be used to delimit multiple directories.
-    This directive may be used more than once.  Modifications to
-    $LOAD_PATH take place immediately and in the order they were
-    specified on the command-line.
-
--r, \--require LIBRARY
-:   require a specified LIBRARY before executing the application.  The
-    \"require\" statement will be executed immediately and in the order
-    they were specified on the command-line.
-
-# SIGNALS
-
-See yahns(1)
-
-# FILES
-
-See Rack documentation for a description of the rackup file format.
-
-# ENVIRONMENT VARIABLES
-
-The RACK_ENV variable is set by the aforementioned \-E switch.
-If RACK_ENV is already set, it will be used unless \-E is used.
-See rackup documentation for more details.
-
-# CONTACT
-
-All feedback welcome via plain-text mail to <yahns-public@yhbt.net>\
-No subscription is necessary to post to the mailing list.
-
-# COPYRIGHT
-
-Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
-License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
-
-# SEE ALSO
-
-yahns(1), yahns_config(5)
-
-* *Rack::Builder* ri/RDoc
-* [Rack RDoc][1]
-* [Rackup HowTo][2]
-
-[1]: http://rdoc.info/gems/r#/gems/rack/frames
-[2]: http://wiki.github.com/rack/rack/tutorial-rackup-howto