Lots of changes & bugfixes as requested on the list. Pre-1 of 1.17.1.17pre1

1 files changed, 115 insertions, 49 deletions

diff --git a/LICENSE b/LICENSE
index 5d855ea..1b82b9d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,55 +1,121 @@
-$Id: LICENSE,v 1.3 2002/05/14 21:50:51 helios Exp $
+$Id: LICENSE,v 1.4 2002/06/27 20:09:17 helios Exp $
 
 Copyright (c) 2002 Christopher B. Powell. All rights reserved.
 Portions copyright (c) 2000 The Apache Software Foundation.  
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       Apache Software Foundation (http://www.apache.org/)
-       and by Christopher Powell, mod_log_mysql Module Maintainer
-       (http://www.grubbybaby.com/mod_log_mysql/)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "mod_log_mysql" and "mod_log_sql" must
-   not be used to endorse or promote products derived from this
-   software without prior written permission. For written
-   permission, please contact <chris@grubbybaby.com>.
-
-5. Products derived from this software may not be called
-   "mod_log_mysql" or "mod_log_sql", nor may "mod_log_mysql" or
-   "mod_log_sql" appear in their names, without prior written permission
-   of Christopher B. Powell.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment: "This product includes software developed by
-   Christopher B. Powell <chris@grubbybaby.com> for use in the
-   mod_log_mysql project (http://www.grubbybaby.com/mod_log_mysql/).
-
-THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+
+Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+
+Definitions:
+
+* "Package" refers to the collection of files distributed by the
+  Copyright Holder, and derivatives of that collection of files created
+  through textual modification.
+
+* "Standard Version" refers to such a Package if it has not been
+  modified, or has been modified in accordance with the wishes of the
+  Copyright Holder.
+
+* "Copyright Holder" is Christopher B. Powell, <chris@grubbybaby.com>.
+
+* "You" is you, if you're thinking about copying or distributing this
+  Package.
+
+* "Reasonable copying fee" is whatever you can justify on the basis of
+  media cost, duplication charges, time of people involved, and so on.
+  (You will not be required to justify it to the Copyright Holder, but
+  only to the computing community at large as a market that must bear the
+  fee.)
+
+* "Freely Available" means that no fee is charged for the item itself,
+  though there may be fees involved in handling the item. It also means
+  that recipients of the item may redistribute it under the same
+  conditions they received it.
+
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated
+disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder. A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way,
+provided that you insert a prominent notice in each changed file
+stating how and when you changed that file, and provided that you do at
+least ONE of the following:
+
+        a) place your modifications in the Public Domain or otherwise make
+        them Freely Available, such as by posting said modifications to
+        Usenet or an equivalent medium, or placing the modifications on a
+        major archive site such as ftp.uu.net, or by allowing the
+        Copyright Holder to include your modifications in the Standard
+        Version of the Package.
+
+        b) use the modified Package only within your corporation or
+        organization.
+
+        c) rename any non-standard executables so the names do not
+        conflict with standard executables, which must also be provided,
+        and provide a separate manual page for each non-standard
+        executable that clearly documents how it differs from the Standard
+        Version.
+
+        d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+        a) distribute a Standard Version of the executables and library
+        files, together with instructions (in the manual page or
+        equivalent) on where to get the Standard Version.
+
+        b) accompany the distribution with the machine-readable source of
+        the Package with your modifications.
+
+        c) accompany any non-standard executables with their corresponding
+        Standard Version executables, giving the non-standard executables
+        non-standard names, and clearly documenting the differences in
+        manual pages (or equivalent), together with instructions on where
+        to get the Standard Version.
+
+        d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this Package.
+You may not charge a fee for this Package itself. However, you may
+distribute this Package in aggregate with other (possibly commercial)
+programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whomever generated
+them, and may be sold commercially, and may be aggregated with this
+Package.
+
+7. C or perl subroutines supplied by you and linked into this Package
+shall not be considered part of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or
+promote products derived from this software without specific prior
+written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+The End