Added GPLv2 as alternate license terms, and specified that the software

is licensed under LGPLv3 *or above* or GPLv2 *or above* (user's choice).

Author: bji

COPYING-GPLv2

@@ -6,7 +6,9 @@
 #
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +22,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX

COPYING renamed to COPYING-LGPLv3

@@ -1,12 +1,12 @@
 # GNUmakefile.mingw
 #
-# Copyright 2008 Bryan Ischo <bryan@ischo.com>
-#
 # This file is part of libs3.
 #
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +20,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX

GNUmakefile

@@ -1,12 +1,12 @@
 # GNUmakefile.osx
 #
-# Copyright 2008 Bryan Ischo <bryan@ischo.com>
-#
 # This file is part of libs3.
 #
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +20,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX

GNUmakefile.mingw

@@ -2,7 +2,11 @@ Copyright 2008 Bryan Ischo <bryan@ischo.com>
 
 libs3 is free software: you can redistribute it and/or modify it under the
 terms of the GNU Lesser General Public License as published by the Free
-Software Foundation, version 3 of the License.
+Software Foundation, version 3 or above of the License.
+
+You can also redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
+version 2 or above of the License.
 
 In addition, as a special exception, the copyright holders give
 permission to link the code of this library and its programs with the
@@ -14,5 +18,9 @@ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 details.
 
 You should have received a copy of the GNU Lesser General Public License
-version 3 along with libs3, in a file named COPYING.  If not, see
+version 3 along with libs3, in a file named COPYING-LGPLv3.  If not, see
+<http://www.gnu.org/licenses/>.
+
+You should also have received a copy of the GNU General Public License
+version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
 <http://www.gnu.org/licenses/>.

GNUmakefile.osx

@@ -2,12 +2,14 @@
  * error_parser.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef ERROR_PARSER_H

LICENSE

@@ -7,7 +7,9 @@
  *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef LIBS3_H

inc/error_parser.h

@@ -2,12 +2,14 @@
  * pthread.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef PTHREAD_H

inc/libs3.h

@@ -2,12 +2,14 @@
  * select.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 // This file is used only on a MingW build, and converts an include of

inc/mingw/pthread.h

@@ -2,12 +2,14 @@
  * utsname.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 // This file is used only on a MingW build, and provides an implementation

inc/mingw/sys/select.h

@@ -7,7 +7,9 @@
  *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef REQUEST_H

inc/mingw/sys/utsname.h

@@ -2,12 +2,14 @@
  * request_context.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef REQUEST_CONTEXT_H

inc/request.h

@@ -2,12 +2,14 @@
  * response_headers_handler.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef RESPONSE_HEADERS_HANDLER_H

inc/request_context.h

@@ -2,12 +2,14 @@
  * simplexml.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef SIMPLEXML_H

inc/response_headers_handler.h

@@ -2,12 +2,14 @@
  * string_buffer.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef STRING_BUFFER_H