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 --- test/test_helper.rb | 3 ++- test/unit/test_http_parser.rb | 3 ++- test/unit/test_request.rb | 3 ++- test/unit/test_response.rb | 3 ++- test/unit/test_server.rb | 3 ++- test/unit/test_signals.rb | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/test_helper.rb b/test/test_helper.rb index 9763f62..3471b55 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # Copyright (c) 2005 Zed A. Shaw -# 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 http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_http_parser.rb b/test/unit/test_http_parser.rb index 41055b0..797a449 100644 --- a/test/unit/test_http_parser.rb +++ b/test/unit/test_http_parser.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # Copyright (c) 2005 Zed A. Shaw -# 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 http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb index bd452a5..4943dc0 100644 --- a/test/unit/test_request.rb +++ b/test/unit/test_request.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # 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 require 'test/test_helper' diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb index 1c2707a..054c3dd 100644 --- a/test/unit/test_response.rb +++ b/test/unit/test_response.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # Copyright (c) 2005 Zed A. Shaw -# 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 http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 403bd1f..4d06dd3 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # Copyright (c) 2005 Zed A. Shaw -# 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 http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index 5a3b519..0adf153 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -1,7 +1,8 @@ # -*- encoding: binary -*- # 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 # # Ensure we stay sane in the face of signals being sent to us -- cgit v1.2.3-24-ge0c7