yahns 1.12.4 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc252e71729c27f38d5ef8bb6f82274d80408e5
-  data.tar.gz: ba8aa4cbf09b75919f065ba64924f1f6e76603d8
+  metadata.gz: b9e19ad9295dcdd4fb3423900a4061e9a4495597
+  data.tar.gz: e98ed154740a92a0378b0ddc255561bcda1ea391
 SHA512:
-  metadata.gz: d768bd39c63353df5d086f6a5c1dfcb7c5e4725b4198ac2bf273a2c43865b3f804a1c4cd0d029bc8b95dc0eb4ecde6803e49a56eeba936df50da11a5458896ed
-  data.tar.gz: e0a962d0514d0c0fd19ab83b3109c0b75ed07e551900c87307c0fba8300b346b1bedd9bb84036ede20ce0bc55fff509c1306e53f5c0074e0aa2e0e58ca8da10b
+  metadata.gz: 5e80a5f1d8ec22f04c7e80a1d128e18a6c05923ad2c850cafdae763c50e03c29242279160d73de267593789ab09b5e31beff797d177f5ff57aba7939de174480
+  data.tar.gz: 44fec12611e1e0f8f83868879b53c8fb9186e61c8be1bc5b020c4879ed25fdbbe5c1eb3aabe650e7b2270d7c4dcb6b77f1f21949926755987f1fe1bd05a37f0f

data/GIT-VERSION-GEN

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

data/lib/yahns/http_client.rb

@@ -22,8 +22,7 @@ def step_write
     case rv = @state.wbuf_flush(self)
     when :wait_writable, :wait_readable
       return rv # tell epoll/kqueue to wait on this more
-    when :ignore # :ignore on hijack
-      @state = :ignore
+    when :ignore # :ignore on hijack, @state already set in hijack_cleanup
       return :ignore
     when Yahns::StreamFile
       @state = rv # continue looping
@@ -254,8 +253,9 @@ def yahns_read(bytes, buf)
   # (and complicated) as our hijack support will allow "un-hijacking"
   # the socket.
   def hijack_cleanup
-    # prevent socket from holding process up
+    # prevent socket from holding process exit up
     Thread.current[:yahns_fdmap].forget(self)
+    @state = :ignore
     @input = nil # keep env["rack.input"] accessible, though
   end
 

data/lib/yahns/proxy_http_response.rb

@@ -105,8 +105,12 @@ def proxy_response_start(res, tip, kcar, req_res)
 
     # 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
+    if alive && ! term
+      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
+        alive = false
+      end
     end
     res << (alive ? "Connection: keep-alive\r\n\r\n".freeze
                   : "Connection: close\r\n\r\n".freeze)

data/lib/yahns/proxy_pass.rb

@@ -226,9 +226,12 @@ def call(env)
       ver = 'HTTP/1.0'.freeze
     end
 
+    addr = env['REMOTE_ADDR']
+    xff = env['HTTP_X_FORWARDED_FOR']
+    xff = xff =~ /\S/ ? "#{xff}, #{addr}" : addr
     req = "#{env['REQUEST_METHOD']} #{req} #{ver}\r\n" \
           "X-Forwarded-Proto: #{env['rack.url_scheme']}\r\n" \
-          "X-Forwarded-For: #{env["REMOTE_ADDR"]}\r\n".dup
+          "X-Forwarded-For: #{xff}\r\n".dup
 
     # pass most HTTP_* headers through as-is
     chunked = false

data/test/test_client_expire.rb

@@ -99,6 +99,14 @@ def test_client_expire_desperate
       end
       stderr_path err.path
     end
+
+    # 1024 is common on old systems, but nowadays Jessie seems to be 65536
+    nr = Process.getrlimit(:NOFILE)[0]
+    if nr >= 1024
+      nr = 1024
+      do_rlimit = true
+    end
+
     pid = mkserver(cfg) do
       keep = { $stderr => true, $stdout => true, $stdin => true, @srv => true }
       ObjectSpace.each_object(IO) do |obj|
@@ -108,7 +116,9 @@ def test_client_expire_desperate
         rescue IOError # could be uninitialized
         end
       end
+      Process.setrlimit(:NOFILE, nr) if do_rlimit
     end
+
     f = get_tcp_client(host, port)
     f.write "G"
     s = get_tcp_client(host, port)
@@ -119,10 +129,9 @@ def test_client_expire_desperate
     assert_match(%r{keep-alive}, str)
     sleep 1
 
-    # ignore errors, just beat the crap out of the process
-    nr = Process.getrlimit(:NOFILE)[0] # 1024 is common
     assert_operator nr, :>, 666, "increase RLIM_NOFILE (ulimit -n)"
     nr -= 50
+    # ignore errors, just beat the crap out of the process
     opts = { out: "/dev/null", err: "/dev/null", close_others: true }
     begin
       pids = 2.times.map do

data/test/test_proxy_pass.rb

@@ -572,6 +572,16 @@ def check_response_trailer(host, port)
   end
 
   def check_eof_body(host, port)
+    Timeout.timeout(30) do
+      s = TCPSocket.new(host, port)
+      s.write("GET /eof-body-fast HTTP/1.0\r\nConnection:keep-alive\r\n\r\n")
+      res = s.read
+      assert_match %r{\AHTTP/1\.[01] 200 OK\r\n}, res
+      assert_match %r{\r\nConnection: close\r\n}, res
+      assert_match %r{\r\n\r\neof-body-fast\z}, res
+      s.close
+    end
+
     Timeout.timeout(60) do
       s = TCPSocket.new(host, port)
       s.write("GET /eof-body-fast HTTP/1.0\r\n\r\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-06-05 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.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: sleepy, multi-threaded, non-blocking application server