From cd22c595633ec36b69c60f27f2c3841ae0f6faca Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Aug 2011 19:54:32 +0000 Subject: add GPLv3 option to the license Existing license terms (Ruby-specific) and GPLv2 remain in place, but GPLv3 is preferred as it helps with distribution of AGPLv3 code and is explicitly compatible with Apache License (v2.0). Many more reasons are documented by the FSF: https://www.gnu.org/licenses/quick-guide-gplv3.html http://gplv3.fsf.org/rms-why.html ref: http://thread.gmane.org/gmane.comp.lang.ruby.unicorn.general/933 --- lib/unicorn/app/inetd.rb | 3 ++- lib/unicorn/app/old_rails.rb | 3 ++- lib/unicorn/app/old_rails/static.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/unicorn/app') diff --git a/lib/unicorn/app/inetd.rb b/lib/unicorn/app/inetd.rb index 2a212a2..b851214 100644 --- a/lib/unicorn/app/inetd.rb +++ b/lib/unicorn/app/inetd.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # :enddoc: # Copyright (c) 2009 Eric Wong -# You can redistribute it and/or modify it under the same terms as Ruby. +# You can redistribute it and/or modify it under the same terms as Ruby 1.8 or +# the GPLv3 # this class *must* be used with Rack::Chunked module Unicorn::App diff --git a/lib/unicorn/app/old_rails.rb b/lib/unicorn/app/old_rails.rb index 5f04ce7..ad1ca8e 100644 --- a/lib/unicorn/app/old_rails.rb +++ b/lib/unicorn/app/old_rails.rb @@ -4,7 +4,8 @@ # This code is based on the original Rails handler in Mongrel # Copyright (c) 2005 Zed A. Shaw # Copyright (c) 2009 Eric Wong -# You can redistribute it and/or modify it under the same terms as Ruby. +# You can redistribute it and/or modify it under the same terms as Ruby 1.8 or +# the GPLv3 # Additional work donated by contributors. See CONTRIBUTORS for more info. require 'unicorn/cgi_wrapper' require 'dispatcher' diff --git a/lib/unicorn/app/old_rails/static.rb b/lib/unicorn/app/old_rails/static.rb index 1d53717..2257270 100644 --- a/lib/unicorn/app/old_rails/static.rb +++ b/lib/unicorn/app/old_rails/static.rb @@ -3,7 +3,8 @@ # This code is based on the original Rails handler in Mongrel # Copyright (c) 2005 Zed A. Shaw # Copyright (c) 2009 Eric Wong -# You can redistribute it and/or modify it under the same terms as Ruby. +# You can redistribute it and/or modify it under the same terms as Ruby 1.8 or +# the GPLv3 # Static file handler for Rails < 2.3. This handler is only provided # as a convenience for developers. Performance-minded deployments should -- cgit v1.2.3-24-ge0c7