Permalink
Browse files

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
  • Loading branch information...
1 parent 8bed251 commit cd22c595633ec36b69c60f27f2c3841ae0f6faca Eric Wong committed Aug 29, 2011
View
899 COPYING
Oops, something went wrong.
View
17 LICENSE
@@ -1,8 +1,17 @@
Unicorn is copyrighted free software by all contributors, see logs in
-revision control for names and email addresses of all of them. You can
-redistribute it and/or modify it under either the terms of the
-{GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or
-the conditions below:
+revision control for names and email addresses of all of them.
+
+You can redistribute it and/or modify it under either the terms of the
+GNU General Public License (GPL) as published by the Free Software
+Foundation (FSF), version {3.0}[http://www.gnu.org/licenses/gpl-3.0.txt]
+or version {2.0}[http://www.gnu.org/licenses/gpl-2.0.txt]
+or the Ruby-specific license terms (see below).
+
+The unicorn project leader (Eric Wong) reserves the right to add future
+versions of the GPL (and no other licenses) as published by the FSF to
+the licensing terms.
+
+=== Ruby-specific terms (if you're not using the GPLv2 or GPLv3)
1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the
View
6 README
@@ -62,9 +62,9 @@ both the the request and response in between \Unicorn and slow clients.
\Unicorn is copyright 2009 by all contributors (see logs in git).
It is based on Mongrel 1.1.5 and carries the same license.
-Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
-under the Ruby (1.8) license and the GPL2. See the included LICENSE file
-for details.
+Mongrel is copyright 2007 Zed A. Shaw and contributors. It is
+tri-licensed under (your choice) of the GPLv3, GPLv2 or Ruby-specific
+terms. See the included LICENSE file for details.
\Unicorn is 100% Free Software.
@@ -1,7 +1,8 @@
/**
* Copyright (c) 2009 Eric Wong (all bugs are Eric's fault)
* 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
*/
#include "ruby.h"
#include "ext_help.h"
View
@@ -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
@@ -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'
@@ -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
@@ -4,7 +4,8 @@
# This code is based on the original CGIWrapper from 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.
View
@@ -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.
@@ -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.
@@ -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'
@@ -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.
View
@@ -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.
@@ -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

0 comments on commit cd22c59

Please sign in to comment.