yahns 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a1df35604f8a2a57198e315bc7a3f1c0f008d2
-  data.tar.gz: 7ad6f6bf6464151fcb205a774e68475549f1a73b
+  metadata.gz: 100f23910c77a7e45fdb98c841bf13a166eb0b63
+  data.tar.gz: ea3c7b2801fa134773bc079f637ccf419b5e6ef5
 SHA512:
-  metadata.gz: 2cc36eff407f38c2fe1d768e334455f311672dd0e82f1376fce79151ef4ec07fe1019646087eb24a1d0cb01d5b792cf40da6eb9ac295d58b9e4bb28e9ecb6e99
-  data.tar.gz: 8b28720a5ff4234b702347cef2e2cc7e5309886ef6b021ef1592cf2d9363c53235209def345329df1903859697f69b4c3afaafa8f946318c708cc8bd34fd205a
+  metadata.gz: 7ee178fa9b9b1122a4446353ca6c6f4744aa1589679deef510fe3afeae40f72f66b8ccb96b56476e2e67383b6cd17f10f23c1fedfd81ab588056944e5693fb83
+  data.tar.gz: 1f7a89edf6427deeb0f01b26461c744fa56dc22edc5f84d14eacfb48a50618a5622dcc28e67041843d1ff5de2d6b40c4144b580f044e8770f1e453e268ab10a0

data/GIT-VERSION-GEN

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

data/lib/yahns/http_response.rb

@@ -131,68 +131,66 @@ def http_response_write(res, opt)
     term = false
     hdr_only, chunk_ok = opt
 
-    if @hs.headers?
-      code = status.to_i
-      hdr_only ||= Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(code)
-      msg = Rack::Utils::HTTP_STATUS_CODES[code]
-      buf = "#{response_start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
-            "Date: #{httpdate}\r\n".dup
-      headers.each do |key, value|
-        case key
-        when %r{\ADate\z}i
-          next
-        when %r{\AContent-Range\z}i
-          if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ value
-            offset = $1.to_i
-            count = $2.to_i - offset + 1
-          end
-          kv_str(buf, key, value)
-        when %r{\AConnection\z}i
-          # allow Rack apps to tell us they want to drop the client
-          alive = false if value =~ /\bclose\b/i
-        when %r{\AContent-Length\z}i
-          term = true
-          clen = value.to_i
-          flags |= MSG_MORE if clen > 0 && !hdr_only
-          kv_str(buf, key, value)
-        when %r{\ATransfer-Encoding\z}i
-          term = true if value =~ /\bchunked\b/i
-          kv_str(buf, key, value)
-        when "rack.hijack"
-          hijack = value
-        else
-          kv_str(buf, key, value)
+    code = status.to_i
+    hdr_only ||= Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(code)
+    msg = Rack::Utils::HTTP_STATUS_CODES[code]
+    buf = "#{response_start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
+          "Date: #{httpdate}\r\n".dup
+    headers.each do |key, value|
+      case key
+      when %r{\ADate\z}i
+        next
+      when %r{\AContent-Range\z}i
+        if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ value
+          offset = $1.to_i
+          count = $2.to_i - offset + 1
         end
-      end
-      count ||= clen
-
-      if !term && chunk_ok
+        kv_str(buf, key, value)
+      when %r{\AConnection\z}i
+        # allow Rack apps to tell us they want to drop the client
+        alive = false if value =~ /\bclose\b/i
+      when %r{\AContent-Length\z}i
         term = true
-        body = Yahns::ChunkBody.new(body, opt)
-        buf << "Transfer-Encoding: chunked\r\n".freeze
+        clen = value.to_i
+        flags |= MSG_MORE if clen > 0 && !hdr_only
+        kv_str(buf, key, value)
+      when %r{\ATransfer-Encoding\z}i
+        term = true if value =~ /\bchunked\b/i
+        kv_str(buf, key, value)
+      when "rack.hijack"
+        hijack = value
+      else
+        kv_str(buf, key, value)
       end
-      alive &&= term
-      buf << (alive ? "Connection: keep-alive\r\n\r\n".freeze
-                    : "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 # unlikely, hope the skb grows
-      when :wait_writable, :wait_readable # unlikely
-        if self.class.output_buffering
-          alive = hijack ? hijack : alive
-          rv = response_header_blocked(buf, body, alive, offset, count)
-          body = nil # ensure we do not close body in ensure
-          return rv
-        else
-          response_wait_write(rv) or return :close
-        end
-      end while true
     end
+    count ||= clen
+
+    if !term && chunk_ok && !hdr_only
+      term = true
+      body = Yahns::ChunkBody.new(body, opt)
+      buf << "Transfer-Encoding: chunked\r\n".freeze
+    end
+    alive &&= (term || hdr_only)
+    buf << (alive ? "Connection: keep-alive\r\n\r\n".freeze
+                  : "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 # unlikely, hope the skb grows
+    when :wait_writable, :wait_readable # unlikely
+      if self.class.output_buffering
+        alive = hijack ? hijack : alive
+        rv = response_header_blocked(buf, body, alive, offset, count)
+        body = nil # ensure we do not close body in ensure
+        return rv
+      else
+        response_wait_write(rv) or return :close
+      end
+    end while @hs.headers?
 
     return response_hijacked(hijack) if hijack
     return http_response_done(alive) if hdr_only

data/lib/yahns/proxy_http_response.rb

@@ -120,7 +120,7 @@ def proxy_res_headers(res, req_res)
 
     # chunk the response ourselves if the client supports it,
     # but the backend does not terminate properly
-    if alive && ! term
+    if alive && ! term && have_body
       if env['HTTP_VERSION'] == 'HTTP/1.1'.freeze
         res << "Transfer-Encoding: chunked\r\n".freeze
       else # we can't persist HTTP/1.0 and HTTP/0.9 w/o Content-Length

data/lib/yahns/queue_epoll.rb

@@ -38,7 +38,7 @@ def thr_init
     Thread.current[:yahns_queue] = self
   end
 
-  # returns an array of infinitely running threads
+  # returns an infinitely running thread
   def worker_thread(logger, max_events)
     Thread.new do
       thr_init

data/lib/yahns/queue_kqueue.rb

@@ -47,7 +47,7 @@ def thr_init
     Thread.current[:yahns_queue] = self
   end
 
-  # returns an array of infinitely running threads
+  # returns an infinitely running thread
   def worker_thread(logger, max_events)
     Thread.new do
       thr_init

data/test/test_auto_chunk.rb

@@ -18,7 +18,12 @@ def test_auto_head
         app = Rack::Builder.new do
           use Rack::ContentType, "text/plain"
           run(lambda do |env|
-            [ 200, {}, %w(a b c) ]
+            case env['PATH_INFO']
+            when '/204'
+              [ 204, {}, [] ]
+            else
+              [ 200, {}, %w(a b c) ]
+            end
           end)
         end
         app(:rack, app) { listen "#{host}:#{port}" }
@@ -50,6 +55,21 @@ def test_auto_head
       assert_equal 200, res.code.to_i
       assert_equal 'abc', res.body
     end
+
+    s = TCPSocket.new(host, port)
+    s.write("GET /204 HTTP/1.1\r\nHost: example.com\r\n\r\n")
+    buf = s.readpartial(1024)
+    assert_match %r{\r\n\r\n\z}, buf
+    refute_match %r{^Transfer-Encoding}i, buf
+    assert_match %r{^Connection: keep-alive\r\n}, buf
+    assert_nil IO.select([s], nil, nil, 1), 'connection persists..'
+
+    # maek sure another on the same connection works
+    s.write("GET / HTTP/1.1\r\nHost: example.com\r\n\r\n")
+    buf = s.readpartial(1024)
+    assert_match %r{\AHTTP/1\.1 200}, buf
+    assert_match(%r{^Transfer-Encoding: chunked\r\n}, buf)
+    s.close
   ensure
     quit_wait(pid)
   end

data/test/test_proxy_pass.rb

@@ -154,6 +154,9 @@ def chunky.each
          env['rack.hijack'].call.close
          # should not be seen:
          [ 123, [ %w(Content-Type text/html), %w(Content-Length 0) ], [] ]
+        when '/204'
+          buf = env['rack.input'].read # drain
+          [ 204, {}, [] ]
         else
           buf = env['rack.input'].read
           [ 201, {
@@ -271,6 +274,7 @@ def test_proxy_pass
       end
     end
 
+    check_204_on_put(host, port)
     check_forbidden_put(host, port)
     check_eof_body(host, port)
     check_pipelining(host, port)
@@ -639,4 +643,33 @@ def check_forbidden_put(host, port)
   ensure
     to_close.each(&:close)
   end
+
+  def check_204_on_put(host, port)
+    s = TCPSocket.new(host, port)
+    s.write("PUT /204 HTTP/1.1\r\nHost: example.com\r\n" \
+            "Content-Length: 11\r\n" \
+            "Content-Type: application/octet-stream\r\n" \
+            "\r\nhello worldPUT")
+    buf = s.readpartial(1024)
+    assert_match %r{\AHTTP/1\.1 204}, buf
+    assert_match %r{\r\n\r\n\z}, buf
+    refute_match %r{^Transfer-Encoding}i, buf
+    refute_match %r{^Content-Length}i, buf
+    assert_match %r{^Connection: keep-alive\r\n}, buf
+    assert_nil IO.select([s], nil, nil, 1), 'connection persists..'
+
+    # make sure another on the same connection works
+    s.write(" / HTTP/1.1\r\nHost: example.com\r\n" \
+            "Content-Length: 11\r\n" \
+            "Content-Type: application/octet-stream\r\n" \
+            "\r\nhello world")
+    buf = s.readpartial(1024)
+    assert_match %r{\r\n\r\nhello world\z}, buf
+    assert_match %r{\AHTTP/1\.1 201}, buf
+    assert_match(%r{^Content-Length: 11\r\n}, buf)
+    assert_match %r{^Connection: keep-alive\r\n}, buf
+    assert_nil IO.select([s], nil, nil, 1), 'connection persists..'
+  ensure
+    s.close if s
+  end
 end

data/test/test_rack_hijack.rb

@@ -86,6 +86,12 @@ def test_hijack
     assert_equal "rack.input contents: BLAH", res.body
     assert_equal 201, res.code.to_i
     assert_equal "1.0", res.http_version
+
+    # ancient "HTTP/0.9"
+    c = get_tcp_client(host, port)
+    c.write("GET /hijack_res\r\n\r\n")
+    res = Timeout.timeout(30) { c.read }
+    assert_equal 'response.hijacked', res
   ensure
     quit_wait(pid)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio