unicorn 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 277fcaa980e2e0c38def0c8d5d2a62de55ad659d
-  data.tar.gz: 315f01cb5df3ab7c606cc7071f457431161a34fb
+  metadata.gz: ad413ab1a47428cacfbcae82684d4cbe36e77d33
+  data.tar.gz: 752c0ca2043e8e5e05558a7eb515b53f5e3107d0
 SHA512:
-  metadata.gz: 81284810b2b5fa7575737c865ced8e90491a22e24db092a15f381da8a802608e12c5c9a7beea5d99603cd2c167fb5ea5d937708b26c1e28f66ee80980a06b7ae
-  data.tar.gz: 4ca0c767edc69c6e93b5b58329266ac81234ff1da9b4640a1c19bc97f3a3e9d8911727205e47a4ad1a89c328042096bd213a85a367717687e9adc715f635810b
+  metadata.gz: 7ca49a70bdc5a632797db82b10f30af7b3b4db10f856ef81b275d4e5b939454191aaae1883d0bb83129c7a95d3a697faec6e51ae2438ba5588f70ee6d04b73e7
+  data.tar.gz: d28bc86a89d0ebb29ecaec72f363e6c0991ab71e22c4ed43d44b9e6b8cc8c8b03939de84c005a91b8473d833cf691f42cb2c3684f5ac1d1c91c4af87c7f78fad

data/.olddoc.yml

@@ -13,3 +13,6 @@ noindex:
 - unicorn_rails_1
 public_email: unicorn-public@bogomips.org
 private_email: unicorn@bogomips.org
+nntp_url:
+  - nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
+  - nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general

data/Documentation/unicorn.1.txt

@@ -175,7 +175,6 @@ the unicorn config file.
 
 # SEE ALSO
 
-* unicorn_rails(1)
 * *Rack::Builder* ri/RDoc
 * *Unicorn::Configurator* ri/RDoc
 * [Unicorn RDoc][1]

data/Documentation/unicorn_rails.1.txt

@@ -4,7 +4,7 @@
 
 # NAME
 
-unicorn_rails - a script/server-like command to launch the Unicorn HTTP server
+unicorn_rails - unicorn launcher for Rails 1.x and 2.x users
 
 # SYNOPSIS
 

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 5.0.1
+GIT_VERSION = 5.1.0

data/GIT-VERSION-GEN

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

data/HACKING

@@ -57,7 +57,7 @@ Please wrap documentation at 72 characters-per-line or less (long URLs
 are exempt) so it is comfortably readable from terminals.
 
 When referencing mailing list posts, use
-"http://bogomips.org/unicorn-public/m/$MESSAGE_ID.html" if possible
+<tt>http://bogomips.org/unicorn-public/$MESSAGE_ID/</tt> if possible
 since the Message-ID remains searchable even if a particular site
 becomes unavailable.
 

data/ISSUES

@@ -5,7 +5,7 @@ submit patches and/or obtain support after you have searched the
 {email archives}[http://bogomips.org/unicorn-public/] and
 {documentation}[http://unicorn.bogomips.org/].
 
-* No subscription will ever be required to email the public inbox.
+* No subscription will ever be required to email us
 * Cc: all participants in a thread or commit, as subscription is optional
 * Do not {top post}[http://catb.org/jargon/html/T/top-post.html] in replies
 * Quote as little as possible of the message you're replying to
@@ -69,9 +69,7 @@ document distributed with git) on guidelines for patch submission.
 * nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
 * http://bogomips.org/unicorn-public/
 
-We operate a {public-inbox}[http://public-inbox.org/] which
-feeds the mailing list.  Subscription is optional, so Cc:
-all participants.
+Mailing list subscription is optional, so Cc: all participants.
 
 You can follow along via NNTP:
 
@@ -86,7 +84,7 @@ Or Atom feeds:
 	also has links to per-thread Atom feeds and downloadable
 	mboxes.
 
-You may also subscribe via plain-text email:
+You may optionally subscribe via plain-text email:
 
 	mailto:unicorn-public+subscribe@bogomips.org
 	(and confirming the auto-reply)

data/LATEST

@@ -1,29 +1,37 @@
-=== unicorn 5.0.0.pre2 - another prerelease! / 2015-07-06 21:37 UTC
-
-  There is a minor TCP socket options are now applied to inherited
-  sockets, and we have native support for inheriting sockets from
-  systemd (by emulating the sd_listen_fds(3) function).
-
-  Dynamic changes in the application to Rack::Utils::HTTP_STATUS
-  codes is now supported, so you can use your own custom status
-  lines.
-
-  Ruby 2.2 and later is now favored for performance.
-  Optimizations by using constants which made sense in earlier
-  versions of Ruby are gone: so users of old Ruby versions
-  will see performance regressions.  Ruby 2.2 users should
-  see the same or better performance, and we have less code
-  as a result.
-
-  * doc: update some invalid URLs
-  * apply TCP socket options on inherited sockets
-  * reflect changes in Rack::Utils::HTTP_STATUS_CODES
-  * reduce constants and optimize for Ruby 2.2
-  * http_response: reduce size of multi-line header path
-  * emulate sd_listen_fds for systemd support
-  * test/unit/test_response.rb: compatibility with older test-unit
-
-  This also includes all changes in unicorn 5.0.0.pre1:
-
-  http://bogomips.org/unicorn-public/m/20150615225652.GA16164@dcvr.yhbt.net.html
+=== unicorn 5.1.0 - rack is optional, again / 2016-04-01 00:35 UTC
+
+  Note: no code changes since 5.1.0.pre1 from January.^WNo, wait,
+  last minute performance improvement added today.  See below.
+
+  The big change is rack is not required (but still recommended).
+  Applications are expected to depend on rack on their own so they can
+  specify the version of rack they prefer without unicorn pulling
+  in a newer, potentially incompatible version.
+
+  unicorn will always attempt to work with multiple versions of rack
+  as practical.
+
+  The HTTP parser also switched to using the TypedData C-API for
+  extra type safety and memory usage accounting support in the
+  'objspace' extension.
+
+  Thanks to Adam Duke to bringing the rack change to our attention
+  and Aaron Patterson for helping with the matter.
+
+  Last minute change: we now support the new leftpad() syscall under
+  Linux for major performance and security improvement:
+
+      http://mid.gmane.org/1459463613-32473-1-git-send-email-richard@nod.at
+
+  8^H9 changes since 5.0.1:
+
+        http: TypedData C-API conversion
+        various documentation updates
+        doc: bump olddoc to ~> 1.2 for extra NNTP URL
+        rack is optional at runtime, required for dev
+        doc update for ClientShutdown exceptions class
+        unicorn 5.1.0.pre1 - rack is optional, again
+        doc: reference --keep-file-descriptors for "bundle exec"
+        doc: further trimming to reduce noise
+        use leftpad Linux syscall for speed!
 

data/NEWS

@@ -1,3 +1,160 @@
+=== unicorn 5.1.0 - rack is optional, again / 2016-04-01 00:35 UTC
+
+  Note: no code changes since 5.1.0.pre1 from January.^WNo, wait,
+  last minute performance improvement added today.  See below.
+
+  The big change is rack is not required (but still recommended).
+  Applications are expected to depend on rack on their own so they can
+  specify the version of rack they prefer without unicorn pulling
+  in a newer, potentially incompatible version.
+
+  unicorn will always attempt to work with multiple versions of rack
+  as practical.
+
+  The HTTP parser also switched to using the TypedData C-API for
+  extra type safety and memory usage accounting support in the
+  'objspace' extension.
+
+  Thanks to Adam Duke to bringing the rack change to our attention
+  and Aaron Patterson for helping with the matter.
+
+  Last minute change: we now support the new leftpad() syscall under
+  Linux for major performance and security improvement:
+
+      http://mid.gmane.org/1459463613-32473-1-git-send-email-richard@nod.at
+
+  8^H9 changes since 5.0.1:
+
+        http: TypedData C-API conversion
+        various documentation updates
+        doc: bump olddoc to ~> 1.2 for extra NNTP URL
+        rack is optional at runtime, required for dev
+        doc update for ClientShutdown exceptions class
+        unicorn 5.1.0.pre1 - rack is optional, again
+        doc: reference --keep-file-descriptors for "bundle exec"
+        doc: further trimming to reduce noise
+        use leftpad Linux syscall for speed!
+
+=== unicorn 5.1.0.pre1 - rack is optional, again / 2016-01-27 23:08 UTC
+
+  The big change is rack is not required (but still recommended).
+  Applications are expected to depend on rack on their own so they can
+  specify the version of rack they prefer without unicorn pulling
+  in a newer, potentially incompatible version.
+
+  unicorn will always attempt to work with multiple versions of rack
+  as practical.
+
+  The HTTP parser also switched to using the TypedData C-API for
+  extra type safety and memory usage accounting support in the
+  'objspace' extension.
+
+  Thanks to Adam Duke to bringing the rack change to our attention
+  and Aaron Patterson for helping with the matter.
+
+  There might be more documentation-related changes before 5.1.0
+  final.  I am considering dropping pandoc from manpage generation
+  and relying on pod2man (from Perl) because it has a wider install
+  base.
+
+  5 changes since v5.0.1:
+
+        http: TypedData C-API conversion
+        various documentation updates
+        doc: bump olddoc to ~> 1.2 for extra NNTP URL
+        rack is optional at runtime, required for dev
+        doc update for ClientShutdown exceptions class
+
+=== unicorn 5.0.1 - continuing to violate Rack SPEC / 2015-11-17 22:44 UTC
+
+  Once again, we allow nil values in response headers.  We've had
+  this bug since March 2009, and thus cannot expect existing
+  applications and middlewares running unicorn to fix this.
+
+  Unfortunately, supporting this bug contributes to application
+  server lock-in, but at least we'll document it as such.
+
+  Thanks to Owen Ou <o@heroku.com> for reporting this regression:
+
+    http://bogomips.org/unicorn-public/CAO47=rJa=zRcLn_Xm4v2cHPr6c0UswaFC_omYFEH+baSxHOWKQ@mail.gmail.com/
+
+  Additionally, systemd examples are now in the examples/ directory
+  based on a post by Christos Trochalakis <yatiohi@ideopolis.gr>:
+
+    http://bogomips.org/unicorn-public/20150708130821.GA1361@luke.ws.skroutz.gr/
+
+=== unicorn 5.0.0 - most boring major release. EVER. / 2015-11-01 08:48 UTC
+
+  An evolutionary dead-end since its announcement[1] nearly six years
+  ago, this old-fashioned preforker has had enough bugs and missteps
+  that it's managed to hit version 5!
+
+  I wish I could say unicorn 5 is leaps and bounds better than 4, but
+  it is not.  This major version change allows us to drop some cruft
+  and unused features which accumulated over the years, resulting in
+  several kilobytes of memory saved[2]!
+
+  Compatibility:
+
+  * The horrible, proprietary (:P) "Status:" response header is
+    finally gone, saving at least 16 precious bytes in every HTTP
+    response.  This should make it easier to write custom HTTP clients
+    which are compatible across all HTTP servers.  It will hopefully
+    make migrating between different Rack servers easier for new
+    projects.
+
+  * Ruby 1.8 support removed.  Ruby 1.9.3 is currently the earliest
+    supported version.  However, expect minor, likely-unnoticeable
+    performance regressions if you use Ruby 2.1 or earlier.  Going
+    forward, unicorn will favor the latest version (currently 2.2) of
+    the mainline Ruby implementation, potentially sacrificing
+    performance on older Rubies.
+
+  * Some internal, undocumented features and APIs used by
+    derivative servers are gone; removing bloat and slightly lowering
+    memory use.  We have never and will never endorse the use of any
+    applications or middleware with a dependency on unicorn,
+    applications should be written for Rack instead.
+    Note: Rainbows! 5.0 will be released next week or so to be
+    compatible with unicorn 5.x
+
+  New features:
+
+  * sd_listen_fds(3) emulation added for systemd compatibility.
+    You may now stop using PID files and other process monitoring
+    software when using systemd.
+
+  * Newly-set TCP socket options are now applied to inherited sockets.
+
+  * Dynamic changes in the application to Rack::Utils::HTTP_STATUS
+    hash is now supported; allowing users to set custom status lines
+    in Rack to be reflected in unicorn.  This feature causes a minor
+    performance regression, but is made up for Ruby 2.2 users with
+    other optimizations.
+
+  * The monotonic clock is used under Ruby 2.1+, making the
+    timeout feature immune to system clock changes.
+
+  As unicorn may be used anonymously without registration, the
+  project is committed to supporting anonymous and pseudonymous
+  help requests, contributions and feedback via plain-text mail to:
+
+      unicorn-public@bogomips.org
+
+  The mail submission port (587) is open to those behind firewalls
+  and allows access via Tor and anonymous remailers.
+  Archives are accessible via: http://bogomips.org/unicorn-public/
+  and mirrored to various other places, so you do not need to use
+  a valid address when posting.
+
+  Finally, rest assured the core design of unicorn will never change.
+  It will never use new-fangled things like threads, kqueue or epoll;
+  but will always remain a preforking server serving one client
+  per-process.
+
+  [1] http://mid.gmane.org/20090211230457.GB22926@dcvr.yhbt.net
+  [2] this would've been like, totally gnarly in the 80s!
+
 === unicorn 5.0.0.pre2 - another prerelease! / 2015-07-06 21:37 UTC
 
   There is a minor TCP socket options are now applied to inherited

data/README

@@ -13,7 +13,7 @@ both the the request and response in between unicorn and slow clients.
   {nginx}[http://nginx.org/] or {Rack}[http://rack.github.io/].
 
 * Compatible with Ruby 1.9.3 and later.
-  unicorn 4.8.x will remain supported for Ruby 1.8 users.
+  unicorn 4.x remains supported for Ruby 1.8 users.
 
 * Process management: unicorn will reap and restart workers that
   die from broken apps.  There is no need to manage multiple processes
@@ -27,9 +27,6 @@ both the the request and response in between unicorn and slow clients.
   all run within their own isolated address space and only serve one
   client at a time for maximum robustness.
 
-* Supports all Rack applications, along with pre-Rack versions of
-  Ruby on Rails via a Rack wrapper.
-
 * Builtin reopening of all log files in your application via
   USR1 signal.  This allows logrotate to rotate files atomically and
   quickly via rename instead of the racy and slow copytruncate method.
@@ -54,13 +51,11 @@ both the the request and response in between unicorn and slow clients.
 
 * Simple and easy Ruby DSL for configuration.
 
-* Decodes chunked transfers on-the-fly, thus allowing upload progress
-  notification to be implemented as well as being able to tunnel
-  arbitrary stream-based protocols over HTTP.
+* Decodes chunked requests on-the-fly.
 
 == License
 
-unicorn is copyright 2009 by all contributors (see logs in git).
+unicorn is copyright 2009-2016 by all contributors (see logs in git).
 It is based on Mongrel 1.1.5.
 Mongrel is copyright 2007 Zed A. Shaw and contributors.
 
@@ -68,7 +63,7 @@ unicorn is licensed under (your choice) of the GPLv2 or later
 (GPLv3+ preferred), or Ruby (1.8)-specific terms.
 See the included LICENSE file for details.
 
-unicorn is 100% Free Software.
+unicorn is 100% Free Software (including all development tools used).
 
 == Install
 
@@ -85,10 +80,9 @@ You can get the latest source via git from the following locations
   git://bogomips.org/unicorn.git
   git://repo.or.cz/unicorn.git (mirror)
 
-You may browse the code from the web and download the latest snapshot
-tarballs here:
+You may browse the code from the web:
 
-* http://bogomips.org/unicorn.git (cgit)
+* http://bogomips.org/unicorn.git
 * http://repo.or.cz/w/unicorn.git (gitweb)
 
 See the HACKING guide on how to contribute and build prerelease gems
@@ -102,12 +96,6 @@ In APP_ROOT, run:
 
   unicorn
 
-=== Ancient Rails 1.2 - 2.x versions
-
-In RAILS_ROOT, run:
-
-  unicorn_rails
-
 unicorn will bind to all interfaces on TCP port 8080 by default.
 You may use the +--listen/-l+ switch to bind to a different
 address:port or a UNIX socket.

data/Sandbox

@@ -63,9 +63,9 @@ before_exec hook as illustrated by https://gist.github.com/534668
 === Ruby 2.0.0 close-on-exec and SIGUSR2 incompatibility
 
 Ruby 2.0.0 enforces FD_CLOEXEC on file descriptors by default.  unicorn
-has been prepared for this behavior since unicorn 4.1.0, but we forgot
-to remind the Bundler developers.  This issue is being tracked here:
-https://github.com/bundler/bundler/issues/2628
+has been prepared for this behavior since unicorn 4.1.0, and bundler
+needs the "--keep-file-descriptors" option for "bundle exec":
+http://bundler.io/man/bundle-exec.1.html
 
 == Isolate
 

data/examples/unicorn@.service

@@ -11,6 +11,8 @@ Wants = unicorn.socket
 After = unicorn.socket
 
 [Service]
+# bundler users must use the "--keep-file-descriptors" switch, here:
+# ExecStart = bundle exec --keep-file-descriptors unicorn -c ...
 ExecStart = /usr/bin/unicorn -c /path/to/unicorn.conf.rb /path/to/config.ru
 Sockets = unicorn.socket
 KillSignal = SIGQUIT

data/ext/unicorn_http/unicorn_http.c

@@ -3437,11 +3437,31 @@ post_exec: /* "_out:" also goes here */
   assert(hp->offset <= len && "offset longer than length");
 }
 
+static void hp_mark(void *ptr)
+{
+  struct http_parser *hp = ptr;
+
+  rb_gc_mark(hp->buf);
+  rb_gc_mark(hp->env);
+  rb_gc_mark(hp->cont);
+}
+
+static size_t hp_memsize(const void *ptr)
+{
+  return sizeof(struct http_parser);
+}
+
+static const rb_data_type_t hp_type = {
+  "unicorn_http",
+  { hp_mark, RUBY_TYPED_DEFAULT_FREE, hp_memsize, /* reserved */ },
+  /* parent, data, [ flags ] */
+};
+
 static struct http_parser *data_get(VALUE self)
 {
   struct http_parser *hp;
 
-  Data_Get_Struct(self, struct http_parser, hp);
+  TypedData_Get_Struct(self, struct http_parser, &hp_type, hp);
   assert(hp && "failed to extract http_parser struct");
   return hp;
 }
@@ -3547,21 +3567,12 @@ static void finalize_header(struct http_parser *hp)
     rb_hash_aset(hp->env, g_query_string, rb_str_new(NULL, 0));
 }
 
-static void hp_mark(void *ptr)
-{
-  struct http_parser *hp = ptr;
-
-  rb_gc_mark(hp->buf);
-  rb_gc_mark(hp->env);
-  rb_gc_mark(hp->cont);
-}
-
 static VALUE HttpParser_alloc(VALUE klass)
 {
   struct http_parser *hp;
-  return Data_Make_Struct(klass, struct http_parser, hp_mark, -1, hp);
-}
 
+  return TypedData_Make_Struct(klass, struct http_parser, &hp_type, hp);
+}
 
 /**
  * call-seq:

data/ext/unicorn_http/unicorn_http.rl

@@ -442,11 +442,31 @@ post_exec: /* "_out:" also goes here */
   assert(hp->offset <= len && "offset longer than length");
 }
 
+static void hp_mark(void *ptr)
+{
+  struct http_parser *hp = ptr;
+
+  rb_gc_mark(hp->buf);
+  rb_gc_mark(hp->env);
+  rb_gc_mark(hp->cont);
+}
+
+static size_t hp_memsize(const void *ptr)
+{
+  return sizeof(struct http_parser);
+}
+
+static const rb_data_type_t hp_type = {
+  "unicorn_http",
+  { hp_mark, RUBY_TYPED_DEFAULT_FREE, hp_memsize, /* reserved */ },
+  /* parent, data, [ flags ] */
+};
+
 static struct http_parser *data_get(VALUE self)
 {
   struct http_parser *hp;
 
-  Data_Get_Struct(self, struct http_parser, hp);
+  TypedData_Get_Struct(self, struct http_parser, &hp_type, hp);
   assert(hp && "failed to extract http_parser struct");
   return hp;
 }
@@ -552,21 +572,12 @@ static void finalize_header(struct http_parser *hp)
     rb_hash_aset(hp->env, g_query_string, rb_str_new(NULL, 0));
 }
 
-static void hp_mark(void *ptr)
-{
-  struct http_parser *hp = ptr;
-
-  rb_gc_mark(hp->buf);
-  rb_gc_mark(hp->env);
-  rb_gc_mark(hp->cont);
-}
-
 static VALUE HttpParser_alloc(VALUE klass)
 {
   struct http_parser *hp;
-  return Data_Make_Struct(klass, struct http_parser, hp_mark, -1, hp);
-}
 
+  return TypedData_Make_Struct(klass, struct http_parser, &hp_type, hp);
+}
 
 /**
  * call-seq:

data/lib/unicorn.rb

@@ -1,9 +1,14 @@
 # -*- encoding: binary -*-
 require 'etc'
 require 'stringio'
-require 'rack'
 require 'kgio'
 
+begin
+  require 'rack'
+rescue LoadError
+  warn 'rack not available, functionality reduced'
+end
+
 # :stopdoc:
 # Unicorn module containing all of the classes (include C extensions) for
 # running a Unicorn web server.  It contains a minimalist HTTP server with just
@@ -20,7 +25,9 @@ module Unicorn
   # application dispatch.  This is always raised with an empty backtrace
   # since there is nothing in the application stack that is responsible
   # for client shutdowns/disconnects.  This exception is visible to Rack
-  # applications unless PrereadInput middleware is loaded.
+  # applications unless PrereadInput middleware is loaded.  This
+  # is a subclass of the standard EOFError class and applications should
+  # not rescue it explicitly, but rescue EOFError instead.
   ClientShutdown = Class.new(EOFError)
 
   # :stopdoc:
@@ -32,6 +39,9 @@ module Unicorn
   def self.builder(ru, op)
     # allow Configurator to parse cli switches embedded in the ru file
     op = Unicorn::Configurator::RACKUP.merge!(:file => ru, :optparse => op)
+    if ru =~ /\.ru$/ && !defined?(Rack::Builder)
+      abort "rack and Rack::Builder must be available for processing #{ru}"
+    end
 
     # Op is going to get cleared before the returned lambda is called, so
     # save this value so that it's still there when we need it:
@@ -53,32 +63,33 @@ def self.builder(ru, op)
 
       return inner_app if no_default_middleware
 
+      middleware = { # order matters
+        ContentLength: nil,
+        Chunked: nil,
+        CommonLogger: [ $stderr ],
+        ShowExceptions: nil,
+        Lint: nil,
+        TempfileReaper: nil,
+      }
+
       # return value, matches rackup defaults based on env
       # Unicorn does not support persistent connections, but Rainbows!
       # and Zbatery both do.  Users accustomed to the Rack::Server default
       # middlewares will need ContentLength/Chunked middlewares.
       case ENV["RACK_ENV"]
       when "development"
-        Rack::Builder.new do
-          use Rack::ContentLength
-          use Rack::Chunked
-          use Rack::CommonLogger, $stderr
-          use Rack::ShowExceptions
-          use Rack::Lint
-          use Rack::TempfileReaper if Rack.const_defined?(:TempfileReaper)
-          run inner_app
-        end.to_app
       when "deployment"
-        Rack::Builder.new do
-          use Rack::ContentLength
-          use Rack::Chunked
-          use Rack::CommonLogger, $stderr
-          use Rack::TempfileReaper if Rack.const_defined?(:TempfileReaper)
-          run inner_app
-        end.to_app
+        middleware.delete(:ShowExceptions)
+        middleware.delete(:Lint)
       else
-        inner_app
+        return inner_app
       end
+      Rack::Builder.new do
+        middleware.each do |m, args|
+          use(Rack.const_get(m), *args) if Rack.const_defined?(m)
+        end
+        run inner_app
+      end.to_app
     end
   end
 

data/lib/unicorn/configurator.rb

@@ -181,8 +181,6 @@ def before_exec(*args, &block)
   # to have nginx always retry backends that may have had workers
   # SIGKILL-ed due to timeouts.
   #
-  #    # See http://wiki.nginx.org/NginxHttpUpstreamModule for more details
-  #    # on nginx upstream configuration:
   #    upstream unicorn_backend {
   #      # for UNIX domain socket setups:
   #      server unix:/path/to/.unicorn.sock fail_timeout=0;
@@ -192,6 +190,9 @@ def before_exec(*args, &block)
   #      server 192.168.0.8:8080 fail_timeout=0;
   #      server 192.168.0.9:8080 fail_timeout=0;
   #    }
+  #
+  # See http://nginx.org/en/docs/http/ngx_http_upstream_module.html
+  # for more details on nginx upstream configuration.
   def timeout(seconds)
     set_int(:timeout, seconds, 3)
     # POSIX says 31 days is the smallest allowed maximum timeout for select()

data/lib/unicorn/http_response.rb

@@ -10,10 +10,13 @@
 # is the job of Rack, with the exception of the "Date" and "Status" header.
 module Unicorn::HttpResponse
 
+  STATUS_CODES = defined?(Rack::Utils::HTTP_STATUS_CODES) ?
+                 Rack::Utils::HTTP_STATUS_CODES : {}
+
   # internal API, code will always be common-enough-for-even-old-Rack
   def err_response(code, response_start_sent)
     "#{response_start_sent ? '' : 'HTTP/1.1 '}" \
-      "#{code} #{Rack::Utils::HTTP_STATUS_CODES[code]}\r\n\r\n"
+      "#{code} #{STATUS_CODES[code]}\r\n\r\n"
   end
 
   # writes the rack_response to socket as an HTTP response
@@ -23,7 +26,7 @@ def http_response_write(socket, status, headers, body,
 
     if headers
       code = status.to_i
-      msg = Rack::Utils::HTTP_STATUS_CODES[code]
+      msg = STATUS_CODES[code]
       start = response_start_sent ? ''.freeze : 'HTTP/1.1 '.freeze
       buf = "#{start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
             "Date: #{httpdate}\r\n" \

data/lib/unicorn/http_server.rb

@@ -36,7 +36,7 @@ class Unicorn::HttpServer
   # or even different installations of the same applications without
   # downtime.  Keys of this constant Hash are described as follows:
   #
-  # * 0 - the path to the unicorn/unicorn_rails executable
+  # * 0 - the path to the unicorn executable
   # * :argv - a deep copy of the ARGV array the executable originally saw
   # * :cwd - the working directory of the application, this is where
   # you originally started Unicorn.
@@ -45,7 +45,7 @@ class Unicorn::HttpServer
   # you can set the following in your Unicorn config file, HUP and then
   # continue with the traditional USR2 + QUIT upgrade steps:
   #
-  #   Unicorn::HttpServer::START_CTX[0] = "/home/bofh/2.2.0/bin/unicorn"
+  #   Unicorn::HttpServer::START_CTX[0] = "/home/bofh/2.3.0/bin/unicorn"
   START_CTX = {
     :argv => ARGV.map(&:dup),
     0 => $0.dup,

data/lib/unicorn/version.rb

@@ -1 +1 @@
-Unicorn::Const::UNICORN_VERSION = '5.0.1'
+Unicorn::Const::UNICORN_VERSION = '5.1.0'

data/man/man1/unicorn.1

@@ -205,8 +205,6 @@ Users relying on this feature do not need to specify a listen socket in
 the unicorn config file.
 .SH SEE ALSO
 .IP \[bu] 2
-unicorn_rails(1)
-.IP \[bu] 2
 \f[I]Rack::Builder\f[] ri/RDoc
 .IP \[bu] 2
 \f[I]Unicorn::Configurator\f[] ri/RDoc

data/man/man1/unicorn_rails.1

@@ -1,8 +1,7 @@
 .TH UNICORN_RAILS 1 "September 17, 2009" "Unicorn User Manual"
 .SH NAME
 .PP
-unicorn_rails - a script/server-like command to launch the Unicorn HTTP
-server
+unicorn_rails - unicorn launcher for Rails 1.x and 2.x users
 .SH SYNOPSIS
 .PP
 unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE]

data/test/unit/test_http_parser.rb

@@ -851,4 +851,18 @@ def test_memory_leak
          File.readable?(LINUX_PROC_PID_STATUS) &&
          !defined?(RUBY_ENGINE)
 
+  def test_memsize
+    require 'objspace'
+    if ObjectSpace.respond_to?(:memsize_of)
+      n = ObjectSpace.memsize_of(Unicorn::HttpParser.new)
+      assert_kind_of Integer, n
+      # need to update this when 128-bit machines come out
+      # n.b. actual struct size on 64-bit is 56 bytes + 40 bytes for RVALUE
+      # Ruby <= 2.2 objspace did not count the 40-byte RVALUE, 2.3 does.
+      assert_operator n, :<=, 96
+      assert_operator n, :>, 0
+    end
+  rescue LoadError
+    # not all Ruby implementations have objspace
+  end
 end

data/unicorn.gemspec

@@ -31,16 +31,16 @@
   # version requirements here.
   s.required_ruby_version = '< 3.0'
 
-  # for people that are absolutely stuck on Rails 2.3.2 and can't
-  # up/downgrade to any other version, the Rack dependency may be
-  # commented out.  Nevertheless, upgrading to Rails 2.3.4 or later is
-  # *strongly* recommended for security reasons.
-  s.add_dependency(%q<rack>)
+  # We do not have a hard dependency on rack, it's possible to load
+  # things which respond to #call.  HTTP status lines in responses
+  # won't have descriptive text, only the numeric status.
+  s.add_development_dependency(%q<rack>)
+
   s.add_dependency(%q<kgio>, '~> 2.6')
   s.add_dependency(%q<raindrops>, '~> 0.7')
 
   s.add_development_dependency('test-unit', '~> 3.0')
-  s.add_development_dependency('olddoc', '~> 1.0')
+  s.add_development_dependency('olddoc', '~> 1.2')
 
   # Note: To avoid ambiguity, we intentionally avoid the SPDX-compatible
   # 'Ruby' here since Ruby 1.9.3 switched to BSD-2-Clause, but we

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - unicorn hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 description: |-
   unicorn is an HTTP server for Rack applications designed to only serve
   fast clients on low-latency, high-bandwidth connections and take
@@ -115,8 +115,6 @@ extra_rdoc_files:
 - lib/unicorn/util.rb
 - lib/unicorn/oob_gc.rb
 - lib/unicorn/worker.rb
-- unicorn_1
-- unicorn_rails_1
 - ISSUES
 - Sandbox
 - Links
@@ -278,8 +276,6 @@ files:
 - test/unit/test_upload.rb
 - test/unit/test_util.rb
 - unicorn.gemspec
-- unicorn_1
-- unicorn_rails_1
 homepage: http://unicorn.bogomips.org/
 licenses:
 - GPL-2.0+
@@ -301,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix

data/unicorn_1

@@ -1 +0,0 @@
-olddoc_placeholder

data/unicorn_rails_1

@@ -1 +0,0 @@
-olddoc_placeholder