yahns 1.11.0 → 1.12.0

data/lib/yahns/http_client.rb

@@ -1,12 +1,9 @@
 # -*- encoding: binary -*-
-# 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
 class Yahns::HttpClient < Kgio::Socket # :nodoc:
-  NULL_IO = StringIO.new("")
-
-  # FIXME: we shouldn't have this at all when we go Unicorn 5-only
-  Unicorn::HttpParser.respond_to?(:keepalive_requests=) and
-    Unicorn::HttpParser.keepalive_requests = 0xffffffff
+  NULL_IO = StringIO.new(''.dup) # :nodoc:
 
   include Yahns::HttpResponse
   QEV_FLAGS = Yahns::Queue::QEV_RD # used by acceptor

data/lib/yahns/http_context.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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
 
 # subclasses of Yahns::HttpClient will class extend this
 
@@ -16,7 +17,7 @@ module Yahns::HttpContext # :nodoc:
   attr_accessor :qegg
   attr_accessor :queue # set right before spawning acceptors
   attr_reader :app
-  attr_reader :app_defaults
+  attr_accessor :app_defaults
   attr_writer :input_buffer_tmpdir
   attr_accessor :output_buffer_tmpdir
 
@@ -79,13 +80,15 @@ def errors
 
   def tmpio_for(len, env)
     # short requests are most common
-    return StringIO.new('') if len && len <= @client_body_buffer_size;
-
-    # too big or chunked, unknown length
-    tmp = @input_buffer_tmpdir
-    mbs = @client_max_body_size
-    tmp = mbs ? Yahns::CapInput.new(mbs, tmp) : Yahns::TmpIO.new(tmp)
-    (env['rack.tempfiles'] ||= []) << tmp
+    if len && len <= @client_body_buffer_size;
+      # Can't use binmode, yet: https://bugs.ruby-lang.org/issues/11945
+      tmp = StringIO.new(''.dup)
+    else # too big or chunked, unknown length
+      tmp = @input_buffer_tmpdir
+      mbs = @client_max_body_size
+      tmp = mbs ? Yahns::CapInput.new(mbs, tmp) : Yahns::TmpIO.new(tmp)
+      (env['rack.tempfiles'] ||= []) << tmp
+    end
     tmp
   end
 end

data/lib/yahns/http_response.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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 'stream_file'
 require_relative 'wbuf_str'
 
@@ -134,7 +135,7 @@ def http_response_write(status, headers, body)
       code = status.to_i
       msg = Rack::Utils::HTTP_STATUS_CODES[code]
       buf = "#{response_start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
-            "Date: #{httpdate}\r\n"
+            "Date: #{httpdate}\r\n".dup
       headers.each do |key, value|
         case key
         when %r{\ADate\z}i
@@ -161,11 +162,13 @@ def http_response_write(status, headers, body)
                     : "Connection: close\r\n\r\n".freeze)
       case rv = kgio_syssend(buf, flags)
       when nil # all done, likely
+        buf.clear
+        buf = nil # recycle any memory we used ASAP
         break
       when String
         flags = MSG_DONTWAIT
-        buf = rv # hope the skb grows
-      when :wait_writable, :wait_readable
+        buf = rv # unlikely, hope the skb grows
+      when :wait_writable, :wait_readable # unlikely
         if k.output_buffering
           alive = hijack ? hijack : alive
           rv = response_header_blocked(rv, buf, body, alive, offset, count)

data/lib/yahns/log.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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
 
 # logging-related utility functions for all of yahns
 module Yahns::Log # :nodoc:

data/lib/yahns/max_body.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
 # License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# frozen_string_literal: true
 
 # Middleware used to enforce client_max_body_size for TeeInput users.
 #

data/lib/yahns/max_body/rewindable_wrapper.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
 # License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# frozen_string_literal: true
 class Yahns::MaxBody::RewindableWrapper < Yahns::MaxBody::Wrapper # :nodoc:
   def initialize(rack_input, limit)
     @orig_limit = limit
@@ -9,7 +10,7 @@ def initialize(rack_input, limit)
 
   def rewind
     @limit = @orig_limit
-    @rbuf = ''
+    @rbuf = ''.dup
     @input.rewind
   end
 

data/lib/yahns/max_body/wrapper.rb

@@ -1,11 +1,14 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013-2015 all contributors <yahns-public@yhbt.net>
+# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
 # License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# frozen_string_literal: true
 #
 # This is only used for chunked request bodies, which are rare
 class Yahns::MaxBody::Wrapper # :nodoc:
   def initialize(rack_input, limit)
-    @input, @limit, @rbuf = rack_input, limit, ''
+    @input = rack_input
+    @limit = limit
+    @rbuf = ''.dup
   end
 
   def each
@@ -16,7 +19,7 @@ def each
 
   # chunked encoding means this method behaves more like readpartial,
   # since Rack does not support a method named "readpartial"
-  def read(length = nil, rv = '')
+  def read(length = nil, rv = ''.dup)
     if length
       if length <= @rbuf.size
         length < 0 and raise ArgumentError, "negative length #{length} given"
@@ -45,6 +48,7 @@ def gets
 
       if tmp = checked_read(16384)
         @rbuf << tmp
+        tmp.clear
       elsif @rbuf.empty? # EOF
         return nil
       else # EOF, return whatever is left
@@ -53,7 +57,7 @@ def gets
     end while true
   end
 
-  def checked_read(length = 16384, buf = '')
+  def checked_read(length = 16384, buf = ''.dup)
     if @input.read(length, buf)
       throw :yahns_EFBIG if ((@limit -= buf.size) < 0)
       return buf
@@ -62,10 +66,11 @@ def checked_read(length = 16384, buf = '')
 
   def read_all
     rv = @rbuf.slice!(0, @rbuf.size)
-    tmp = ''
+    tmp = ''.dup
     while checked_read(16384, tmp)
       rv << tmp
     end
+    tmp.clear
     rv
   end
 end

data/lib/yahns/openssl_client.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2014, all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (see COPYING for details)
+# 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 'sendfile_compat'
 

data/lib/yahns/openssl_server.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2014, all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (see COPYING for details)
+# 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 'acceptor'
 require_relative 'openssl_client'

data/lib/yahns/proxy_http_response.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2015 all contributors <yahns-public@yhbt.net>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <yahns-public@yhbt.net>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 
 # loaded by yahns/proxy_pass, this relies on Yahns::HttpResponse for
 # constants.
@@ -69,7 +70,7 @@ def proxy_response_start(res, tip, kcar, req_res)
     alive = @hs.next? && self.class.persistent_connections
     response_headers = env['yahns.proxy_pass.response_headers']
 
-    res = "HTTP/1.1 #{msg ? %Q(#{code} #{msg}) : status}\r\n"
+    res = "HTTP/1.1 #{msg ? %Q(#{code} #{msg}) : status}\r\n".dup
     headers.each do |key,value| # n.b.: headers is an Array of 2-element Arrays
       case key
       when /\A(?:Connection|Keep-Alive)\z/i
@@ -123,7 +124,7 @@ def proxy_response_start(res, tip, kcar, req_res)
 
       elsif kcar.chunked? # nasty chunked body
         req_res.proxy_trailers = nil # define to avoid warnings for now
-        buf = ''
+        buf = ''.dup
         case tmp = tip.shift || req_res.kgio_tryread(0x2000, rbuf)
         when String
           kcar.filter_body(buf, tmp)
@@ -136,7 +137,7 @@ def proxy_response_start(res, tip, kcar, req_res)
 
         buf = tmp
         req_res.proxy_trailers = [ buf, tlr = [] ]
-        rbuf = Thread.current[:yahns_rbuf] = ''
+        rbuf = Thread.current[:yahns_rbuf] = ''.dup
         until kcar.trailers(tlr, buf)
           case rv = req_res.kgio_tryread(0x2000, rbuf)
           when String
@@ -186,7 +187,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
       end while len != 0
 
     elsif kcar.chunked? # nasty chunked body
-      buf = ''
+      buf = ''.dup
 
       unless req_res.proxy_trailers
         # are we done dechunking the main body, yet?
@@ -200,7 +201,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
           return :wait_readable # self remains in :ignore, wait on upstream
         end until kcar.body_eof?
         req_res.proxy_trailers = [ tmp, [] ] # onto trailers!
-        rbuf = Thread.current[:yahns_rbuf] = ''
+        rbuf = Thread.current[:yahns_rbuf] = ''.dup
       end
 
       buf, tlr = *req_res.proxy_trailers

data/lib/yahns/proxy_pass.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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 'socket'
 require 'kgio'
 require 'kcar' # gem install kcar
@@ -10,7 +11,7 @@
 require_relative 'proxy_http_response'
 
 class Yahns::ProxyPass # :nodoc:
-  class ReqRes < Kgio::Socket
+  class ReqRes < Kgio::Socket # :nodoc:
     attr_writer :resbuf
     attr_accessor :proxy_trailers
 
@@ -24,7 +25,7 @@ def req_start(c, req, input, chunked)
     # we must reinitialize the thread-local rbuf if it may get beyond the
     # current thread
     def detach_rbuf!
-      Thread.current[:yahns_rbuf] = ''
+      Thread.current[:yahns_rbuf] = ''.dup
     end
 
     def yahns_step # yahns event loop entry point
@@ -225,7 +226,8 @@ def call(env)
     end
 
     req = "#{env['REQUEST_METHOD']} #{req} #{ver}\r\n" \
-          "X-Forwarded-For: #{env["REMOTE_ADDR"]}\r\n"
+          "X-Forwarded-Proto: #{env['rack.url_scheme']}\r\n" \
+          "X-Forwarded-For: #{env["REMOTE_ADDR"]}\r\n".dup
 
     # pass most HTTP_* headers through as-is
     chunked = false

data/lib/yahns/queue.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2014, all contributors
-# 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
 if SleepyPenguin.const_defined?(:Epoll)
   require_relative 'queue_epoll'
 else

data/lib/yahns/queue_egg.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
 
 # this represents a Yahns::Queue before its vivified.  This only
 # lives in the parent process and should be clobbered after qc_vivify

data/lib/yahns/queue_epoll.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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
 #
 # This is the dangerous, low-level epoll interface for sleepy_penguin
 # It is safe as long as you're aware of all potential concurrency
@@ -32,7 +33,7 @@ def queue_mod(io, flags)
   end
 
   def thr_init
-    Thread.current[:yahns_rbuf] = ""
+    Thread.current[:yahns_rbuf] = ''.dup
     Thread.current[:yahns_fdmap] = @fdmap
     Thread.current[:yahns_queue] = self
   end

data/lib/yahns/queue_kqueue.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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
 #
 # This is the dangerous, low-level kqueue interface for sleepy_penguin
 # It is safe as long as you're aware of all potential concurrency
@@ -41,7 +42,7 @@ def queue_mod(io, flags)
   end
 
   def thr_init
-    Thread.current[:yahns_rbuf] = ""
+    Thread.current[:yahns_rbuf] = ''.dup
     Thread.current[:yahns_fdmap] = @fdmap
     Thread.current[:yahns_queue] = self
   end

data/lib/yahns/queue_quitter.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 'sleepy_penguin'
 

data/lib/yahns/queue_quitter_pipe.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
 #
 # POSIX pipe version, see queue_quitter.rb for the (preferred) eventfd one
 class Yahns::QueueQuitter # :nodoc:

data/lib/yahns/rack.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# 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 'rack'
 class Yahns::Rack # :nodoc:
   attr_reader :preload
@@ -62,10 +63,10 @@ def app_defaults
       "rack.run_once" => false,
       "rack.hijack?" => true,
       "rack.version" => [ 1, 2 ],
-      "SCRIPT_NAME" => "",
+      "SCRIPT_NAME" => ''.dup,
 
       # this is not in the Rack spec, but some apps may rely on it
-      "SERVER_SOFTWARE" => "yahns"
+      "SERVER_SOFTWARE" => 'yahns'.dup
     }
   end
 

data/lib/yahns/rackup_handler.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2014, all contributors
-# 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 '../yahns'
 
 module Yahns::RackupHandler # :nodoc:
@@ -38,6 +39,7 @@ def self.run(app, o)
     Yahns::Server.new(cfg).start.join
   end
 
+  # this is called by Rack::Server
   def self.valid_options
     # these should be the most common options
     {

data/lib/yahns/sendfile_compat.rb

@@ -1,12 +1,13 @@
 # -*- encoding: binary -*-
-# 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
 
-module Yahns::SendfileCompat
+module Yahns::SendfileCompat # :nodoc:
   def trysendfile(io, offset, count)
     return 0 if count == 0
     count = 0x4000 if count > 0x4000
-    buf = Thread.current[:yahns_sfbuf] ||= ''
+    buf = Thread.current[:yahns_sfbuf] ||= ''.dup
     io.pos = offset
     str = io.read(count, buf) or return # nil for EOF
     n = 0
@@ -21,7 +22,3 @@ def trysendfile(io, offset, count)
     end while true
   end
 end
-
-class IO
-  include Yahns::SendfileCompat
-end

data/lib/yahns/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 'queue_quitter'
 require_relative 'tcp_server'
 require_relative 'unix_server'
@@ -379,7 +380,17 @@ def fdmap_init
       ctx.queue = queues[qegg] ||= qegg_vivify(qegg, fdmap)
       ctx = ctx.dup
       ctx.__send__(:include, l.expire_mod)
-      ctx.__send__(:include, Yahns::OpenSSLClient) if opts[:ssl_ctx]
+      if ssl_ctx = opts[:ssl_ctx]
+        ctx.__send__(:include, Yahns::OpenSSLClient)
+        env = ctx.app_defaults = ctx.app_defaults.dup
+        env['HTTPS'] = 'on' # undocumented, but Rack::Request uses this
+        env['rack.url_scheme'] = 'https'
+
+        # call OpenSSL::SSL::SSLContext#setup explicitly here to detect
+        # errors and avoid race conditions.  We avoid calling this in the
+        # parent process since
+        ssl_ctx.setup
+      end
       ctx_list << ctx
       # acceptors feed the the queues
       l.spawn_acceptor(opts[:threads] || 1, @logger, ctx)