unicorn 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3857fb0079316977174fc2e513749fd8b76297e719caf6e172097099eb57752
-  data.tar.gz: 68edc58cd61e17a3f409b56d963ed2f8b458f9d457772c7cfa9df933b76af6a4
+  metadata.gz: cd2fc6250af1faf8048df529538386a6974dcbd1aac58db683a710b804bae1e8
+  data.tar.gz: 50aeca90aada5aeb9869cf3885681fe9029bee6183c99c8b85afb3d0803b479f
 SHA512:
-  metadata.gz: 01cae9ce7852f28d4484ffbf458ca9a40b3b19b4531c2b633287751fabc5547076eddd7e773ab2bad6b2812e95b4a717a6ae598fa183061844948f0cd417dcfc
-  data.tar.gz: 850460b0d5caa60e23b2a386a5d2dcaf8321722c81dcb9aa65d55c46a0b81978fd305eda915478e566efa29dd8e605bc73ca3a3ae214af6e91083b64df5468e1
+  metadata.gz: 83ebf917cc17380114648c22f9cb3ad59bda6125d23781e64cd89bb8936bf17bc6bb7292933f9433f1397901022683a63b241d512b31ea1b85e5bc791a10a74e
+  data.tar.gz: d36730df71b5b131de61037f2838b743d587b93b1eeb70eea1956de4aabc9051485626d38debaadd3d5c3ee3c2738ca72f9a9cbc9bafb6eff9e11f08ad272275

data/.manifest

@@ -47,6 +47,7 @@ examples/unicorn@.service
 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
@@ -66,6 +67,7 @@ lib/unicorn/http_server.rb
 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
@@ -156,4 +158,5 @@ test/unit/test_stream_input.rb
 test/unit/test_tee_input.rb
 test/unit/test_upload.rb
 test/unit/test_util.rb
+test/unit/test_waiter.rb
 unicorn.gemspec

data/.olddoc.yml

@@ -3,7 +3,7 @@ cgit_url: https://yhbt.net/unicorn.git
 rdoc_url: https://yhbt.net/unicorn/
 ml_url:
 - https://yhbt.net/unicorn-public/
-- http://ou63pmih66umazou.onion/unicorn-public/
+- http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/unicorn-public/
 merge_html:
   unicorn_1: Documentation/unicorn.1.html
   unicorn_rails_1: Documentation/unicorn_rails.1.html
@@ -13,10 +13,13 @@ noindex:
 - TODO
 - unicorn_rails_1
 public_email: unicorn-public@yhbt.net
+imap_url:
+- imaps://yhbt.net/inbox.comp.lang.ruby.unicorn.0
+- imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.unicorn.0
 nntp_url:
-- nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
-- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.unicorn
+- nntps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
+- nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.unicorn
 - nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
 source_code:
 - git clone https://yhbt.net/unicorn.git
-- torsocks git clone http://ou63pmih66umazou.onion/unicorn.git
+- torsocks git clone http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/unicorn.git

data/CONTRIBUTORS

@@ -1,5 +1,9 @@
-Unicorn developers (let us know if we forgot you):
-* Eric Wong (BDFL, BOFH)
+Unicorn developers (let us know if we forgot you, ...or if you no longer wish
+to be associated with the doofus running this disaster :P):
+* Eric Wong (Bozo Doofus For Life, Bastard Operator From Hell)
+
+There's numerous contributors over email the years, all of our mail
+is archived @ https://yhbt.net/unicorn-public/
 * Suraj N. Kurapati
 * Andrey Stikheev
 * Wayne Larsen

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 6.0.0
+GIT_VERSION = 6.1.0

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-DEF_VER = "v6.0.0"
+DEF_VER = "v6.1.0"
 CONSTANT = "Unicorn::Const::UNICORN_VERSION"
 RVF = "lib/unicorn/version.rb"
 GVF = "GIT-VERSION-FILE"

data/GNUmakefile

@@ -42,13 +42,13 @@ ext_h := $(wildcard $(ext)/*/*.h $(ext)/*.h)
 ext_src := $(sort $(wildcard $(ext)/*.c) $(ext_h) $(ext)/unicorn_http.c)
 ext_pfx_src := $(addprefix $(ext_pfx)/,$(ext_src))
 ext_dir := $(ext_pfx)/$(ext)
-$(ext)/extconf.rb: $(wildcard $(ext)/*.h)
+$(ext)/extconf.rb:
 	@>>$@
 $(ext_dir) $(tmp_bin) man/man1 doc/man1 pkg t/trash:
 	@mkdir -p $@
 $(ext_pfx)/$(ext)/%: $(ext)/% | $(ext_dir)
 	$(INSTALL) -m 644 $< $@
-$(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_h) | $(ext_dir)
+$(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb | $(ext_dir)
 	$(RM) -f $(@D)/*.o
 	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb $(EXTCONF_ARGS)
 ext_sfx := _ext.$(DLEXT)

data/HACKING

@@ -50,9 +50,6 @@ programming experience will come in handy (or be learned) here.
 
 === Documentation
 
-Due to the lack of RDoc-to-manpage converters we know about, we're
-writing manpages in Markdown and converting to troff/HTML with Pandoc.
-
 Please wrap documentation at 72 characters-per-line or less (long URLs
 are exempt) so it is comfortably readable from terminals.
 
@@ -63,7 +60,7 @@ becomes unavailable.
 
 === Ruby/C Compatibility
 
-We target mainline Ruby 1.9.3 and later.  We need the Ruby
+We target C Ruby 2.0 and later.  We need the Ruby
 implementation to support fork, exec, pipe, UNIX signals, access to
 integer file descriptors and ability to use unlinked files.
 
@@ -102,10 +99,6 @@ don't email the git mailing list or maintainer with Unicorn patches :)
 
 == Building a Gem
 
-In order to build the gem, you must install the following components:
-
- * pandoc
-
 You can build the Unicorn gem with the following command:
 
   gmake gem

data/ISSUES

@@ -20,6 +20,10 @@ can interoperate with any bug tracker which can Cc: us plain-text to
 mailto:unicorn-public@yhbt.net   This includes the Debian BTS
 at https://bugs.debian.org/unicorn and possibly others.
 
+unicorn is a server; it does not depend on graphics/audio.  Nobody
+communicating with us will ever be expected to go through the trouble
+of setting up graphics nor audio support.
+
 If your issue is of a sensitive nature or you're just shy in public,
 use anonymity tools such as Tor or Mixmaster; and rely on the public
 mail archives for responses.  Be sure to scrub sensitive log messages
@@ -73,27 +77,21 @@ document distributed with git) on guidelines for patch submission.
 
 == Contact Info
 
-* public: mailto:unicorn-public@yhbt.net
-* nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
-* nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
-* imaps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn.0
-* https://yhbt.net/unicorn-public/
-* http://ou63pmih66umazou.onion/unicorn-public/
-
-Mailing list subscription is optional, so Cc: all participants.
+Mail is publicly-archived, SMTP subscription is discouraged to avoid
+servers being a single-point-of-failure, so Cc: all participants.
 
-You can follow along via NNTP or IMAP (read-only):
+The HTTP(S) archives have links to per-thread Atom feeds and downloadable
+mboxes.  Read-only IMAP(S) folders and NNTP(S) newsgroups are also available.
 
-	nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
-	nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
-	imaps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn.0
-	imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.unicorn.0
-
-Or Atom feeds:
+* https://yhbt.net/unicorn-public/
+* http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/unicorn-public/
+* imaps://yhbt.net/inbox.comp.lang.ruby.unicorn.0
+* imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.unicorn.0
+* nntps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
+* nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
 
-	https://yhbt.net/unicorn-public/new.atom
-	http://ou63pmih66umazou.onion/unicorn-public/new.atom
+Full Atom feeds:
+* https://yhbt.net/unicorn-public/new.atom
+* http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/unicorn-public/new.atom
 
-	The HTML archives at https://yhbt.net/unicorn-public/
-	also has links to per-thread Atom feeds and downloadable
-	mboxes.
+We only accept plain-text mail: mailto:unicorn-public@yhbt.net

data/LATEST

@@ -1,23 +1,24 @@
-=== unicorn 5.5.0 / 2019-03-04 00:41 UTC
-
-  Mostly identical to 5.5.0.pre1, which I didn't hear any feedback
-  from:
-
-    https://bogomips.org/unicorn-public/20181220222842.GA27382@dcvr/
-
-  > Jeremy Evans contributed the "default_middleware" configuration option:
-  >
-  >   https://bogomips.org/unicorn-public/20180913192055.GD48926@jeremyevans.local/
-  >
-  > Jeremy also contributed the ability to use separate groups for the process
-  > and log files:
-  >
-  >   https://bogomips.org/unicorn-public/20180913192449.GE48926@jeremyevans.local/
-  >
-  > There's also a couple of uninteresting minor optimizations and
-  > documentation additions.
-
-  Otherwise, there's one extra change to use
-  rb_gc_register_mark_object which is finally a documented part of
-  the Ruby C-API, but has existed since the 1.9 days.
+=== unicorn 6.0.0 - no more recycling Rack env / 2021-03-17 06:38 UTC
+
+  This release allocates a new Rack `env' hash for every request.
+  This is done for safety with internally-(thread|event)-using Rack
+  apps which expect to use `env' after the normal Rack response is
+  complete, but without relying on rack.hijack[1].  Thanks to
+  Dirkjan Bussink <d.bussink@gmail.com> for the patch:
+
+    https://yhbt.net/unicorn-public/66A68DD8-83EF-4C7A-80E8-3F1F7AB31670@github.com/
+
+  The major version is bumped since:
+
+  1) there are performance regressions for some simple Rack apps
+
+  2) unsupported 3rd-party monkey patches which previously
+     relied on this behavior may be broken (our version of
+     OobGC was).
+
+  The test suite is also more reliable on multi-core systems
+  and Ruby 3.x.
+
+  [1] thread from 2017 around rack.hijack safety:
+      https://yhbt.net/unicorn-public/CAAtdryPG3nLuyo0jxfYW1YHu1Q+ZpkLkd4KdWC8vA46B5haZxw@mail.gmail.com/
 

data/NEWS

@@ -1,3 +1,135 @@
+=== unicorn 6.0.0 - no more recycling Rack env / 2021-03-17 06:38 UTC
+
+  This release allocates a new Rack `env' hash for every request.
+  This is done for safety with internally-(thread|event)-using Rack
+  apps which expect to use `env' after the normal Rack response is
+  complete, but without relying on rack.hijack[1].  Thanks to
+  Dirkjan Bussink <d.bussink@gmail.com> for the patch:
+
+    https://yhbt.net/unicorn-public/66A68DD8-83EF-4C7A-80E8-3F1F7AB31670@github.com/
+
+  The major version is bumped since:
+
+  1) there are performance regressions for some simple Rack apps
+
+  2) unsupported 3rd-party monkey patches which previously
+     relied on this behavior may be broken (our version of
+     OobGC was).
+
+  The test suite is also more reliable on multi-core systems
+  and Ruby 3.x.
+
+  [1] thread from 2017 around rack.hijack safety:
+      https://yhbt.net/unicorn-public/CAAtdryPG3nLuyo0jxfYW1YHu1Q+ZpkLkd4KdWC8vA46B5haZxw@mail.gmail.com/
+
+=== unicorn 5.8.0 - rack.after_reply support / 2020-12-24 20:39 UTC
+
+  This release supports env['rack.after_reply'] which allows
+  rack middleware to pass lambdas to be executed after the client
+  connection is closed, matching functionality in Puma.
+
+  Thanks to Blake Williams for this patch:
+  https://yhbt.net/unicorn-public/9873E53C-04D3-4759-9678-CA17DBAEF7B7@blakewilliams.me/
+
+  The top-level of our website is now simpler and no longer
+  redundant with the contents of https://yhbt.net/unicorn/README.html
+  (which contains the old content)
+
+=== unicorn 5.7.0 / 2020-09-08 08:41 UTC
+
+  Relaxed Ruby version requirements for Ruby 3.0.0dev.
+  Thanks to Jean Boussier for testing
+
+=== unicorn 5.6.0 - early_hints support / 2020-07-26 01:52 UTC
+
+  This release adds support for the early_hints configurator
+  directive for the 'rack.early_hints' API used by Rails 5.2+.
+
+  Thanks to Jean Boussier for the patch.
+
+  Link: https://yhbt.net/unicorn-public/242F0859-0F83-4F14-A0FF-5BE392BB01E6@shopify.com/
+
+=== unicorn 5.5.5 / 2020-04-27 02:48 UTC
+
+  This release fixes a bug for users of multiple listeners setups
+  where a busy listen socket could starve other listeners.
+
+  Thanks to Stan Hu for reporting and testing.
+
+  No need to upgrade if you're using a single listen socket.
+
+  Link: https://yhbt.net/unicorn-public/CAMBWrQ=Yh42MPtzJCEO7XryVknDNetRMuA87irWfqVuLdJmiBQ@mail.gmail.com/
+
+=== unicorn 5.5.4 / 2020-03-24 22:10 UTC
+
+  One change to improve RFC 7230 conformance in the HTTP parser:
+
+  https://yhbt.net/unicorn-public/20200319022823.32472-1-bofh@yhbt.net/
+
+=== unicorn 5.5.3 / 2020-01-31 20:39 UTC
+
+  Documentation updates to switch bogomips.org to yhbt.net since
+  the .org TLD won't be affordable in the near future.
+
+  There's also a few minor test cleanups.
+
+=== unicorn 5.5.2 / 2019-12-20 02:08 UTC
+
+  Thanks to Terry Scheingeld, we now workaround a Ruby bug
+  and can now run with taint checks enabled:
+  <https://bugs.ruby-lang.org/issues/14485>
+  <https://bogomips.org/unicorn-public/CABg1sXrvGv9G6CDQxePDUqTe6N-5UpLXm7eG3YQO=dda-Cgg7A@mail.gmail.com/>
+
+  There's also a few documentation updates and building packages
+  from source is easier since pandoc is no longer a dependency
+  (and I can no longer afford the bandwidth or space to install
+  it).
+
+  Eric Wong (7):
+        test/benchmark/ddstream: demo for slowly reading clients
+        test/benchmark/readinput: demo for slowly uploading clients
+        test/benchmark/uconnect: test for accept loop speed
+        examples/unicorn@.service: note the NonBlocking flag
+        Merge remote-tracking branch 'origin/ts/tmpio'
+        test_util: get rid of some unused variables in tests
+        doc: replace pandoc-"Markdown" with real manpages
+
+  Terry Scheingeld (1):
+        tmpio: workaround File#path being tainted on unlink
+
+=== unicorn 5.5.1 / 2019-05-06 06:40 UTC
+
+  This release fixes and works around issues from v5.5.0 (2019-03-04)
+
+  Stephen Demjanenko worked around a pipe resource accounting bug
+  present in old Linux kernels.  Linux 3.x users from 3.16.57 and
+  on are unaffected.  Linux 4.x users from 4.9 and on are
+  unaffected.
+
+  https://bogomips.org/unicorn-public/1556922018-24096-1-git-send-email-sdemjanenko@gmail.com/
+
+  Stan Pitucha reported a bug with the old `unicorn_rails' wrapper
+  (intended for Rails 2.x users) which was promptly fixed by
+  Jeremy Evans:
+
+  https://bogomips.org/unicorn-public/CAJ2_uEPifcv_ux4sX=t0C4zHTHGhqVfcLcSB2kTU3Rb_6pQ3nw@mail.gmail.com/
+
+  There's also some doc updates to warn users off `unicorn_rails';
+  the homepage is now energy-efficient for OLEDs and CRTs;
+  and I'm no longer advertising mailing list subscriptions
+  (because I hate centralization and mail archives are the priority)
+
+  Eric Wong (3):
+        doc: unicorn_rails: clarify that it is intended for rails <= 2.x
+        doc: stop advertising mailing list subscription
+        doc: switch homepage to dark216
+
+  Jeremy Evans (1):
+        unicorn_rails: fix regression with Rails >= 3.x in app build
+
+  Stephen Demjanenko (1):
+        Rescue failed pipe resizes due to permissions
+
 === unicorn 5.5.0 / 2019-03-04 00:41 UTC
 
   Mostly identical to 5.5.0.pre1, which I didn't hear any feedback

data/README

@@ -12,8 +12,7 @@ both the the request and response in between unicorn and slow clients.
   cut out everything that is better supported by the operating system,
   {nginx}[https://nginx.org/] or {Rack}[https://rack.github.io/].
 
-* Compatible with Ruby 1.9.3 and later.
-  unicorn 4.x remains supported for Ruby 1.8 users.
+* Compatible with Ruby 2.0.0 and later.
 
 * Process management: unicorn will reap and restart workers that
   die from broken apps.  There is no need to manage multiple processes
@@ -138,13 +137,13 @@ information on the {mailing list}[mailto:unicorn-public@yhbt.net].
 The mailing list is archived at https://yhbt.net/unicorn-public/
 
 Read-only NNTP access is available at:
-nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
+nntps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
 nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
 
 Read-only IMAP access is also avaialble at:
-imaps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn.0 and
-imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.unicorn.0
-AUTH=ANONYMOUS mechanism is supported, as is any username+password
+imaps://yhbt.net/inbox.comp.lang.ruby.unicorn.0 and
+imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.unicorn.0
+The AUTH=ANONYMOUS mechanism is supported, as is any username+password
 combination.
 
 For the latest on unicorn releases, you may also finger us at

data/Sandbox

@@ -87,7 +87,7 @@ For now workarounds include doing one of the following:
 
 3. Explicitly setting RUBYLIB or $LOAD_PATH to include any gem path
    where the unicorn gem is installed
-   (e.g. /usr/lib/ruby/gems/1.9.3/gems/unicorn-VERSION/lib)
+   (e.g. /usr/lib/ruby/gems/3.0.0/gems/unicorn-VERSION/lib)
 
 === RUBYOPT pollution from SIGUSR2 upgrades
 

data/ext/unicorn_http/c_util.h

@@ -8,23 +8,15 @@
 
 #include <unistd.h>
 #include <assert.h>
+#include <limits.h>
 
 #define MIN(a,b) (a < b ? a : b)
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
-#ifndef SIZEOF_OFF_T
-#  define SIZEOF_OFF_T 4
-#  warning SIZEOF_OFF_T not defined, guessing 4.  Did you run extconf.rb?
-#endif
-
-#if SIZEOF_OFF_T == 4
-#  define UH_OFF_T_MAX 0x7fffffff
-#elif SIZEOF_OFF_T == 8
-#  if SIZEOF_LONG == 4
-#    define UH_OFF_T_MAX 0x7fffffffffffffffLL
-#  else
-#    define UH_OFF_T_MAX 0x7fffffffffffffff
-#  endif
+#if SIZEOF_OFF_T == SIZEOF_INT
+#  define UH_OFF_T_MAX INT_MAX
+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
+#  define UH_OFF_T_MAX LLONG_MAX
 #else
 #  error off_t size unknown for this platform!
 #endif /* SIZEOF_OFF_T check */

data/ext/unicorn_http/common_field_optimization.h

@@ -83,7 +83,6 @@ static void init_common_fields(void)
   struct common_field *cf = common_http_fields;
   char tmp[64];
 
-  id_uminus = rb_intern("-@");
   memcpy(tmp, HTTP_PREFIX, HTTP_PREFIX_LEN);
 
   for(i = ARRAY_SIZE(common_http_fields); --i >= 0; cf++) {

data/ext/unicorn_http/epollexclusive.h

@@ -0,0 +1,124 @@
+/*
+ * This is only intended for use inside a unicorn worker, nowhere else.
+ * EPOLLEXCLUSIVE somewhat mitigates the thundering herd problem for
+ * mostly idle processes since we can't use blocking accept4.
+ * This is NOT intended for use with multi-threaded servers, nor
+ * single-threaded multi-client ("C10K") servers or anything advanced
+ * like that.  This use of epoll is only appropriate for a primitive,
+ * single-client, single-threaded servers like unicorn that need to
+ * support SIGKILL timeouts and parent death detection.
+ */
+#if defined(HAVE_EPOLL_CREATE1)
+#  include <sys/epoll.h>
+#  include <errno.h>
+#  include <ruby/io.h>
+#  include <ruby/thread.h>
+#endif /* __linux__ */
+
+#if defined(EPOLLEXCLUSIVE) && defined(HAVE_EPOLL_CREATE1)
+#  define USE_EPOLL (1)
+#else
+#  define USE_EPOLL (0)
+#endif
+
+#if USE_EPOLL
+/*
+ * :nodoc:
+ * returns IO object if EPOLLEXCLUSIVE works and arms readers
+ */
+static VALUE prep_readers(VALUE cls, VALUE readers)
+{
+	long i;
+	int epfd = epoll_create1(EPOLL_CLOEXEC);
+	VALUE epio;
+
+	if (epfd < 0) rb_sys_fail("epoll_create1");
+
+	epio = rb_funcall(cls, rb_intern("for_fd"), 1, INT2NUM(epfd));
+
+	Check_Type(readers, T_ARRAY);
+	for (i = 0; i < RARRAY_LEN(readers); i++) {
+		int rc;
+		struct epoll_event e;
+		rb_io_t *fptr;
+		VALUE io = rb_ary_entry(readers, i);
+
+		e.data.u64 = i; /* the reason readers shouldn't change */
+
+		/*
+		 * I wanted to use EPOLLET here, but maintaining our own
+		 * equivalent of ep->rdllist in Ruby-space doesn't fit
+		 * our design at all (and the kernel already has it's own
+		 * code path for doing it).  So let the kernel spend
+		 * cycles on maintaining level-triggering.
+		 */
+		e.events = EPOLLEXCLUSIVE | EPOLLIN;
+		io = rb_io_get_io(io);
+		GetOpenFile(io, fptr);
+		rc = epoll_ctl(epfd, EPOLL_CTL_ADD, fptr->fd, &e);
+		if (rc < 0) rb_sys_fail("epoll_ctl");
+	}
+	return epio;
+}
+#endif /* USE_EPOLL */
+
+#if USE_EPOLL
+struct ep_wait {
+	struct epoll_event *events;
+	rb_io_t *fptr;
+	int maxevents;
+	int timeout_msec;
+};
+
+static void *do_wait(void *ptr) /* runs w/o GVL */
+{
+	struct ep_wait *epw = ptr;
+
+	return (void *)(long)epoll_wait(epw->fptr->fd, epw->events,
+				epw->maxevents, epw->timeout_msec);
+}
+
+/* :nodoc: */
+/* readers must not change between prepare_readers and get_readers */
+static VALUE
+get_readers(VALUE epio, VALUE ready, VALUE readers, VALUE timeout_msec)
+{
+	struct ep_wait epw;
+	long i, n;
+	VALUE buf;
+
+	Check_Type(ready, T_ARRAY);
+	Check_Type(readers, T_ARRAY);
+	epw.maxevents = RARRAY_LENINT(readers);
+	buf = rb_str_buf_new(sizeof(struct epoll_event) * epw.maxevents);
+	epw.events = (struct epoll_event *)RSTRING_PTR(buf);
+	epio = rb_io_get_io(epio);
+	GetOpenFile(epio, epw.fptr);
+
+	epw.timeout_msec = NUM2INT(timeout_msec);
+	n = (long)rb_thread_call_without_gvl(do_wait, &epw, RUBY_UBF_IO, NULL);
+	if (n < 0) {
+		if (errno != EINTR) rb_sys_fail("epoll_wait");
+		n = 0;
+	}
+	/* Linux delivers events in order received */
+	for (i = 0; i < n; i++) {
+		struct epoll_event *ev = &epw.events[i];
+		VALUE obj = rb_ary_entry(readers, ev->data.u64);
+
+		if (RTEST(obj))
+			rb_ary_push(ready, obj);
+	}
+	rb_str_resize(buf, 0);
+	return Qfalse;
+}
+#endif /* USE_EPOLL */
+
+static void init_epollexclusive(VALUE mUnicorn)
+{
+#if USE_EPOLL
+	VALUE cWaiter = rb_define_class_under(mUnicorn, "Waiter", rb_cIO);
+	rb_define_singleton_method(cWaiter, "prep_readers", prep_readers, 1);
+	rb_define_method(cWaiter, "get_readers", get_readers, 3);
+#endif
+}

data/ext/unicorn_http/ext_help.h

@@ -8,30 +8,6 @@
 #  define assert_frozen(f) do {} while (0)
 #endif /* !defined(OBJ_FROZEN) */
 
-#if !defined(OFFT2NUM)
-#  if SIZEOF_OFF_T == SIZEOF_LONG
-#    define OFFT2NUM(n) LONG2NUM(n)
-#  else
-#    define OFFT2NUM(n) LL2NUM(n)
-#  endif
-#endif /* ! defined(OFFT2NUM) */
-
-#if !defined(SIZET2NUM)
-#  if SIZEOF_SIZE_T == SIZEOF_LONG
-#    define SIZET2NUM(n) ULONG2NUM(n)
-#  else
-#    define SIZET2NUM(n) ULL2NUM(n)
-#  endif
-#endif /* ! defined(SIZET2NUM) */
-
-#if !defined(NUM2SIZET)
-#  if SIZEOF_SIZE_T == SIZEOF_LONG
-#    define NUM2SIZET(n) ((size_t)NUM2ULONG(n))
-#  else
-#    define NUM2SIZET(n) ((size_t)NUM2ULL(n))
-#  endif
-#endif /* ! defined(NUM2SIZET) */
-
 static inline int str_cstr_eq(VALUE val, const char *ptr, long len)
 {
   return (RSTRING_LEN(val) == len && !memcmp(ptr, RSTRING_PTR(val), len));

data/ext/unicorn_http/extconf.rb

@@ -1,17 +1,7 @@
 # -*- encoding: binary -*-
 require 'mkmf'
 
-unless RUBY_VERSION < '3.1'
-  warn "Unicorn was only tested against MRI up to 3.0.\n" \
-       "It might not properly work with #{RUBY_VERSION}"
-end
-
-have_macro("SIZEOF_OFF_T", "ruby.h") or check_sizeof("off_t", "sys/types.h")
-have_macro("SIZEOF_SIZE_T", "ruby.h") or check_sizeof("size_t", "sys/types.h")
-have_macro("SIZEOF_LONG", "ruby.h") or check_sizeof("long", "sys/types.h")
-have_func("rb_str_set_len", "ruby.h") or abort 'Ruby 1.9.3+ required'
-have_func("rb_hash_clear", "ruby.h") # Ruby 2.0+
-have_func("gmtime_r", "time.h")
+have_func("rb_hash_clear", "ruby.h") or abort 'Ruby 2.0+ required'
 
 message('checking if String#-@ (str_uminus) dedupes... ')
 begin
@@ -43,4 +33,5 @@ else
   message("no, needs Ruby 2.6+\n")
 end
 
+have_func('epoll_create1', %w(sys/epoll.h))
 create_makefile("unicorn_http")

data/ext/unicorn_http/global_variables.h

@@ -55,7 +55,7 @@ NORETURN(static void parser_raise(VALUE klass, const char *));
 
 /** Defines global strings in the init method. */
 #define DEF_GLOBAL(N, val) do { \
-  g_##N = rb_obj_freeze(rb_str_new(val, sizeof(val) - 1)); \
+  g_##N = str_new_dd_freeze(val, (long)sizeof(val) - 1); \
   rb_gc_register_mark_object(g_##N); \
 } while (0)
 

data/ext/unicorn_http/httpdate.c

@@ -11,6 +11,7 @@ static const char months[] = "Jan\0Feb\0Mar\0Apr\0May\0Jun\0"
 
 /* for people on wonky systems only */
 #ifndef HAVE_GMTIME_R
+# warning using fake gmtime_r
 static struct tm * my_gmtime_r(time_t *now, struct tm *tm)
 {
 	struct tm *global = gmtime(now);