yahns 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7f2c5c9c51e65d39f39ecb7424434393e72673
-  data.tar.gz: dbbc9e3459a4f89ab0bd2ad46bd72f60001d04be
+  metadata.gz: be964a6d1a0a80744bd419b896f4aa83cdadbd06
+  data.tar.gz: 907c5f15f7d6c2d49609326b1a8175d56a09cad7
 SHA512:
-  metadata.gz: 8840e5441afcda2aa8b20c3b0ae3a2fc935d97260f86cea8b04e29ca78d0dfcbaaac717400ca3f7249d1b97c76302b3f1a20758a4d90154b0b0b577f6dc178ae
-  data.tar.gz: a4d783b2ae2a860dfe948bb1d4747afb2dd8bf465bf3faf0c9a530ec5c7cde7fc38fdb0e3fb05c8782364c081ced26728d4a24a7837994738ad586d1fab76229
+  metadata.gz: 7bb344b77483d6fbb091b721fcc7b7d6f789738aa8552f7c7b85e856ca15b2edd2dd12b299b5af80a5d1484bded048c31599c5c187433bbf37987910a6effd47
+  data.tar.gz: 0d1226f4bddf82eb366f71d020cafaedf0b7a0b63eed07792588d902f14aaf26cebee084d8e07379455bf91c1653823887ad35234d20abb09c6581aaab7818b1

data/Documentation/yahns_config.pod

@@ -446,7 +446,10 @@ An example which seems to work is:
   ssl_ctx.key = OpenSSL::PKey::RSA.new(
     IO.read('/etc/ssl/private/example.key')
   )
-  ssl_ctx.set_params # use defaults provided by Ruby on top of OpenSSL
+
+  # use defaults provided by Ruby on top of OpenSSL,
+  # but disable client certificate verification as it is rare:
+  ssl_ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
 
   app(:rack, "/path/to/my/app/config.ru") do
     listen 443, ssl_ctx: ssl_ctx

data/GIT-VERSION-GEN

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

data/lib/yahns/proxy_http_response.rb

@@ -68,6 +68,7 @@ def proxy_response_start(res, tip, kcar, req_res)
                 env['REQUEST_METHOD'] != 'HEAD'.freeze
     flags = MSG_DONTWAIT
     alive = @hs.next? && self.class.persistent_connections
+    term = false
     response_headers = env['yahns.proxy_pass.response_headers']
 
     res = "HTTP/1.1 #{msg ? %Q(#{code} #{msg}) : status}\r\n".dup
@@ -76,7 +77,10 @@ def proxy_response_start(res, tip, kcar, req_res)
       when /\A(?:Connection|Keep-Alive)\z/i
         next # do not let some upstream headers leak through
       when %r{\AContent-Length\z}i
+        term = true
         flags |= MSG_MORE if have_body && value.to_i > 0
+      when %r{\ATransfer-Encoding\z}i
+        term = true if value =~ /\bchunked\b/i
       end
 
       # response header mapping
@@ -92,6 +96,13 @@ def proxy_response_start(res, tip, kcar, req_res)
 
     # For now, do not add a Date: header, assume upstream already did it
     # but do not care if they did not
+
+    # chunk the response ourselves if the client supports it,
+    # but the backend does not terminate properly
+    if alive && ! term && (env['HTTP_VERSION'] == 'HTTP/1.1'.freeze)
+      res << "Transfer-Encoding: chunked\r\n".freeze
+      alive = true
+    end
     res << (alive ? "Connection: keep-alive\r\n\r\n".freeze
                   : "Connection: close\r\n\r\n".freeze)
 
@@ -154,6 +165,7 @@ def proxy_response_start(res, tip, kcar, req_res)
 
         case tmp = tip.shift || req_res.kgio_tryread(0x2000, rbuf)
         when String
+          tmp = chunk_out(tmp) if alive
           wbuf = proxy_write(wbuf, tmp, alive)
         when nil
           req_res.shutdown
@@ -174,7 +186,8 @@ def proxy_response_start(res, tip, kcar, req_res)
 
   def proxy_response_finish(kcar, wbuf, req_res)
     rbuf = Thread.current[:yahns_rbuf]
-    if len = kcar.body_bytes_left
+    alive = wbuf.wbuf_persist
+    if len = kcar.body_bytes_left # known Content-Length
 
       case tmp = req_res.kgio_tryread(0x2000, rbuf)
       when String
@@ -186,7 +199,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
         return :wait_readable # self remains in :ignore, wait on upstream
       end while len != 0
 
-    elsif kcar.chunked? # nasty chunked body
+    elsif kcar.chunked? # nasty chunked response body
       buf = ''.dup
 
       unless req_res.proxy_trailers
@@ -221,8 +234,10 @@ def proxy_response_finish(kcar, wbuf, req_res)
 
       case tmp = req_res.kgio_tryread(0x2000, rbuf)
       when String
+        tmp = chunk_out(tmp) if alive
         wbuf.wbuf_write(self, tmp)
       when nil
+        wbuf.wbuf_write(self, "0\r\n\r\n".freeze) if alive
         req_res.shutdown
         break
       when :wait_readable
@@ -232,7 +247,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
     end
 
     busy = wbuf.busy and return proxy_busy_mod_blocked(wbuf, busy)
-    proxy_busy_mod_done(wbuf.wbuf_persist) # returns nil
+    proxy_busy_mod_done(alive) # returns nil
   end
 
   def proxy_wait_next(qflags)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server