httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/support dbmmanage
Date Mon, 25 Sep 2000 19:18:18 GMT
wrowe       00/09/25 12:18:18

  Modified:    src/support dbmmanage
  Log:
    As long as I was fixing 2.0's copyright...
  
  Revision  Changes    Path
  1.18      +41 -37    apache-1.3/src/support/dbmmanage
  
  Index: dbmmanage
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/dbmmanage,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- dbmmanage	2000/09/25 19:03:11	1.17
  +++ dbmmanage	2000/09/25 19:18:17	1.18
  @@ -1,59 +1,63 @@
   #!/usr/local/bin/perl
   
   # ====================================================================
  -# Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
  +# The Apache Software License, Version 1.1
   #
  +# Copyright (c) 2000 The Apache Software Foundation.  All rights
  +# reserved.
  +#
   # 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. 
  +#    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. All advertising materials mentioning features or use of this
  -#    software must display the following acknowledgment:
  -#    "This product includes software developed by the Apache Group
  -#    for use in the Apache HTTP server project (http://www.apache.org/)."
  -#
  -# 4. The names "Apache Server" and "Apache Group" must not be used to
  -#    endorse or promote products derived from this software without
  -#    prior written permission. For written permission, please contact
  -#    apache@apache.org.
  -#
  -# 5. Products derived from this software may not be called "Apache"
  -#    nor may "Apache" appear in their names without prior written
  -#    permission of the Apache Group.
  -#
  -# 6. Redistributions of any form whatsoever must retain the following
  -#    acknowledgment:
  -#    "This product includes software developed by the Apache Group
  -#    for use in the Apache HTTP server project (http://www.apache.org/)."
  -#
  -# THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP OR
  +# 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/)."
  +#    Alternately, this acknowledgment may appear in the software itself,
  +#    if and wherever such third-party acknowledgments normally appear.
  +#
  +# 4. The names "Apache" and "Apache Software Foundation" must
  +#    not be used to endorse or promote products derived from this
  +#    software without prior written permission. For written
  +#    permission, please contact apache@apache.org.
  +#
  +# 5. Products derived from this software may not be called "Apache",
  +#    nor may "Apache" appear in their name, without prior written
  +#    permission of the Apache Software Foundation.
  +#
  +# 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.
  +# 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.
  +# ====================================================================
   # ====================================================================
   #
   # This software consists of voluntary contributions made by many
  -# individuals on behalf of the Apache Group and was originally based
  -# on public domain software written at the National Center for
  -# Supercomputing Applications, University of Illinois, Urbana-Champaign.
  -# For more information on the Apache Group and the Apache HTTP server
  -# project, please see <http://www.apache.org/>.
  +# individuals on behalf of the Apache Software Foundation.  For more
  +# information on the Apache Software Foundation, please see
  +# <http://www.apache.org/>.
  +#
  +# Portions of this software are based upon public domain software
  +# originally written at the National Center for Supercomputing Applications,
  +# University of Illinois, Urbana-Champaign.
  +#
   
   #for more functionality see the HTTPD::UserAdmin module:
   # http://www.perl.com/CPAN/modules/by-module/HTTPD/HTTPD-Tools-x.xx.tar.gz
  
  
  

Mime
View raw message