* [PATCH 1/3] golf down conditional for socket activation
2015-11-01 8:37 [PATCH 0/3] last updates before 5.0 release Eric Wong
@ 2015-11-01 8:37 ` Eric Wong
2015-11-01 8:37 ` [PATCH 2/3] gemspec: relax Ruby version requirement for old RubyGems Eric Wong
2015-11-01 8:37 ` [PATCH 3/3] doc updates Eric Wong
2 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2015-11-01 8:37 UTC (permalink / raw)
To: unicorn-public; +Cc: Eric Wong
The PID of a process can never be zero as kill(2) interprets a '0'
PID arg as "every process in caller's process group", so there's no
risk of the 'nil.to_i => 0' conversion resulting in a truth value
when compared to $$.
---
lib/unicorn/http_server.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index c1a2e60..ca56ed3 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -770,7 +770,7 @@ class Unicorn::HttpServer
# emulate sd_listen_fds() for systemd
sd_pid, sd_fds = ENV.values_at('LISTEN_PID', 'LISTEN_FDS')
- if sd_pid && sd_pid.to_i == $$
+ if sd_pid.to_i == $$ # n.b. $$ can never be zero
# 3 = SD_LISTEN_FDS_START
inherited.concat((3...(3 + sd_fds.to_i)).to_a)
end
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] gemspec: relax Ruby version requirement for old RubyGems
2015-11-01 8:37 [PATCH 0/3] last updates before 5.0 release Eric Wong
2015-11-01 8:37 ` [PATCH 1/3] golf down conditional for socket activation Eric Wong
@ 2015-11-01 8:37 ` Eric Wong
2015-11-01 8:37 ` [PATCH 3/3] doc updates Eric Wong
2 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2015-11-01 8:37 UTC (permalink / raw)
To: unicorn-public; +Cc: Eric Wong
Older RubyGems (1.8.23.2 at least) does not seem to support
multiple version requirements for the Ruby version; so drop
the lower 1.9.3 requirement for now.
---
unicorn.gemspec | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/unicorn.gemspec b/unicorn.gemspec
index 23450f5..1099361 100644
--- a/unicorn.gemspec
+++ b/unicorn.gemspec
@@ -25,7 +25,11 @@ Gem::Specification.new do |s|
s.files = manifest
s.homepage = Olddoc.config['rdoc_url']
s.test_files = test_files
- s.required_ruby_version = [ '>= 1.9.3', '< 3.0' ]
+
+ # 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'
# 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
@@ -38,5 +42,9 @@ Gem::Specification.new do |s|
s.add_development_dependency('test-unit', '~> 3.0')
s.add_development_dependency('olddoc', '~> 1.0')
- s.licenses = ["GPLv2+", "Ruby 1.8"]
+ # Note: To avoid ambiguity, we intentionally avoid the SPDX-compatible
+ # 'Ruby' here since Ruby 1.9.3 switched to BSD-2-Clause, but we
+ # inherited our license from Mongrel when Ruby was at 1.8.
+ # We cannot automatically switch licenses when Ruby changes.
+ s.licenses = ['GPL-2.0+', 'Ruby-1.8']
end
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] doc updates
2015-11-01 8:37 [PATCH 0/3] last updates before 5.0 release Eric Wong
2015-11-01 8:37 ` [PATCH 1/3] golf down conditional for socket activation Eric Wong
2015-11-01 8:37 ` [PATCH 2/3] gemspec: relax Ruby version requirement for old RubyGems Eric Wong
@ 2015-11-01 8:37 ` Eric Wong
2 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2015-11-01 8:37 UTC (permalink / raw)
To: unicorn-public; +Cc: Eric Wong
ISSUES: note images are considered spam as well as HTML.
Links: Clarify we may only endorse the Free versions of nginx, not the
non-Free versions.
Add a link to Starman as a unicorn derivative, as I even use Starman
myself. Remove yahns, since it's really the complete opposite of
unicorn and probably not appropriate to place next to Starman and
gunicorn
---
ISSUES | 2 +-
Links | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ISSUES b/ISSUES
index 7c91555..394c852 100644
--- a/ISSUES
+++ b/ISSUES
@@ -9,7 +9,7 @@ submit patches and/or obtain support after you have searched the
* 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
-* Do not send HTML mail, it will be flagged as spam
+* Do not send HTML mail or images, it will be flagged as spam
* Anonymous and pseudonymous messages will always be welcome.
* The email submission port (587) is enabled on the bogomips.org MX:
http://bogomips.org/unicorn-public/20141004232241.GA23908@dcvr.yhbt.net/t/
diff --git a/Links b/Links
index 16c9467..6474a9d 100644
--- a/Links
+++ b/Links
@@ -37,14 +37,15 @@ or services behind them.
* {Ruby}[https://www.ruby-lang.org/en/] - the programming language of
Rack and unicorn
-* {nginx}[http://nginx.org/] - the reverse proxy for use with unicorn
+* {nginx}[http://nginx.org/] (Free versions) -
+ the reverse proxy for use with unicorn
=== Derivatives
* {Green Unicorn}[http://gunicorn.org/] - a Python version of unicorn
-* {yahns}[http://yahns.yhbt.net/] - the complete opposite of unicorn in
- every imaginable way. Designed for energy efficiency on idle sites.
+* {Starman}[http://search.cpan.org/dist/Starman/] - Plack/PSGI version
+ of unicorn
=== Prior Work
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread