unicorn 5.5.2 → 6.1.0

data/unicorn.gemspec

@@ -11,24 +11,25 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = (ENV['VERSION'] || '5.5.0').dup
+  s.version = (ENV['VERSION'] || '6.1.0').dup
   s.authors = ['unicorn hackers']
   s.summary = 'Rack HTTP server for fast clients and Unix'
   s.description = File.read('README').split("\n\n")[1]
-  s.email = %q{unicorn-public@bogomips.org}
+  s.email = %q{unicorn-public@yhbt.net}
   s.executables = %w(unicorn unicorn_rails)
   s.extensions = %w(ext/unicorn_http/extconf.rb)
   s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
     File.exist?(f)
   end
   s.files = manifest
-  s.homepage = 'https://bogomips.org/unicorn/'
+  s.homepage = 'https://yhbt.net/unicorn/'
   s.test_files = test_files
 
-  # technically we need ">= 1.9.3", too, but avoid the array here since
-  # old rubygems versions (1.8.23.2 at least) do not support multiple
-  # version requirements here.
-  s.required_ruby_version = '< 3.0'
+  # 2.0.0 is the minimum supported version. We don't specify
+  # a maximum version to make it easier to test pre-releases,
+  # but we do warn users if they install unicorn on an untested
+  # version in extconf.rb
+  s.required_ruby_version = ">= 2.0.0"
 
   # We do not have a hard dependency on rack, it's possible to load
   # things which respond to #call.  HTTP status lines in responses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 6.1.0
 platform: ruby
 authors:
 - unicorn hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2021-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,7 +72,7 @@ description: |-
   advantage of features in Unix/Unix-like kernels.  Slow clients should
   only be served by placing a reverse proxy capable of fully buffering
   both the the request and response in between unicorn and slow clients.
-email: unicorn-public@bogomips.org
+email: unicorn-public@yhbt.net
 executables:
 - unicorn
 - unicorn_rails
@@ -157,6 +157,7 @@ files:
 - ext/unicorn_http/CFLAGS
 - ext/unicorn_http/c_util.h
 - ext/unicorn_http/common_field_optimization.h
+- ext/unicorn_http/epollexclusive.h
 - ext/unicorn_http/ext_help.h
 - ext/unicorn_http/extconf.rb
 - ext/unicorn_http/global_variables.h
@@ -176,6 +177,7 @@ files:
 - lib/unicorn/launcher.rb
 - lib/unicorn/oob_gc.rb
 - lib/unicorn/preread_input.rb
+- lib/unicorn/select_waiter.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/stream_input.rb
 - lib/unicorn/tee_input.rb
@@ -197,7 +199,6 @@ files:
 - t/env.ru
 - t/fails-rack-lint.ru
 - t/heartbeat-timeout.ru
-- t/hijack.ru
 - t/listener_names.ru
 - t/my-tap-lib.sh
 - t/oob_gc.ru
@@ -235,7 +236,6 @@ files:
 - t/t0100-rack-input-tests.sh
 - t/t0116-client_body_buffer_size.sh
 - t/t0116.ru
-- t/t0200-rack-hijack.sh
 - t/t0300-no-default-middleware.sh
 - t/t0301-no-default-middleware-ignored-in-config.sh
 - t/t0301.ru
@@ -268,10 +268,11 @@ files:
 - test/unit/test_tee_input.rb
 - test/unit/test_upload.rb
 - test/unit/test_util.rb
+- test/unit/test_waiter.rb
 - unicorn.gemspec
 - unicorn_1
 - unicorn_rails_1
-homepage: https://bogomips.org/unicorn/
+homepage: https://yhbt.net/unicorn/
 licenses:
 - GPL-2.0+
 - Ruby-1.8
@@ -282,9 +283,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "<"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -301,4 +302,6 @@ test_files:
 - test/unit/test_http_parser_ng.rb
 - test/unit/test_request.rb
 - test/unit/test_server.rb
+- test/unit/test_upload.rb
 - test/unit/test_util.rb
+- test/unit/test_waiter.rb

data/t/hijack.ru

@@ -1,55 +0,0 @@
-use Rack::Lint
-use Rack::ContentLength
-use Rack::ContentType, "text/plain"
-class DieIfUsed
-  @@n = 0
-  def each
-    abort "body.each called after response hijack\n"
-  end
-
-  def close
-    warn "closed DieIfUsed #{@@n += 1}\n"
-  end
-end
-
-envs = []
-
-run lambda { |env|
-  case env["PATH_INFO"]
-  when "/hijack_req"
-    if env["rack.hijack?"]
-      io = env["rack.hijack"].call
-      envs << env
-      if io.respond_to?(:read_nonblock) &&
-         env["rack.hijack_io"].respond_to?(:read_nonblock)
-
-        # exercise both, since we Rack::Lint may use different objects
-        env["rack.hijack_io"].write("HTTP/1.0 200 OK\r\n\r\n")
-        io.write("request.hijacked")
-        io.close
-        return [ 500, {}, DieIfUsed.new ]
-      end
-    end
-    [ 500, {}, [ "hijack BAD\n" ] ]
-  when "/hijack_res"
-    r = "response.hijacked"
-    [ 200,
-      {
-        "Content-Length" => r.bytesize.to_s,
-        "rack.hijack" => proc do |io|
-          envs << env
-          io.write(r)
-          io.close
-        end
-      },
-      DieIfUsed.new
-    ]
-  when "/normal_env_id"
-    b = "#{env.object_id}\n"
-    h = {
-      'Content-Type' => 'text/plain',
-      'Content-Length' => b.bytesize.to_s,
-    }
-    [ 200, h, [ b ] ]
-  end
-}

data/t/t0200-rack-hijack.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 9 "rack.hijack tests (Rack 1.5+ (Rack::VERSION >= [ 1,2]))"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	unicorn -D -c $unicorn_config hijack.ru
-	unicorn_wait_start
-}
-
-t_begin "normal env reused between requests" && {
-	env_a="$(curl -sSf http://$listen/normal_env_id)"
-	b="$(curl -sSf http://$listen/normal_env_id)"
-	test x"$env_a" = x"$b"
-}
-
-t_begin "check request hijack" && {
-	test "xrequest.hijacked" = x"$(curl -sSfv http://$listen/hijack_req)"
-}
-
-t_begin "env changed after request hijack" && {
-	env_b="$(curl -sSf http://$listen/normal_env_id)"
-	test x"$env_a" != x"$env_b"
-}
-
-t_begin "check response hijack" && {
-	test "xresponse.hijacked" = x"$(curl -sSfv http://$listen/hijack_res)"
-}
-
-t_begin "env changed after response hijack" && {
-	env_c="$(curl -sSf http://$listen/normal_env_id)"
-	test x"$env_b" != x"$env_c"
-}
-
-t_begin "env continues to be reused between requests" && {
-	b="$(curl -sSf http://$listen/normal_env_id)"
-	test x"$env_c" = x"$b"
-}
-
-t_begin "killing succeeds after hijack" && {
-	kill $unicorn_pid
-}
-
-t_begin "check stderr for hijacked body close" && {
-	check_stderr
-	grep 'closed DieIfUsed 1\>' $r_err
-	grep 'closed DieIfUsed 2\>' $r_err
-	! grep 'closed DieIfUsed 3\>' $r_err
-}
-
-t_done