From 381f88d56a637e003d972082c77db045cd87419c Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Fri, 16 Feb 2001 04:26:53 +0000 Subject: Update copyright to 2001 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68 --- support/ab.c | 10 +++---- support/apachectl.in | 4 +-- support/apxs.in | 2 +- support/dbmmanage | 68 +++++++++++++++++++++++------------------------ support/htdigest.c | 2 +- support/htpasswd.c | 2 +- support/log_server_status | 2 +- support/logresolve.pl | 2 +- support/rotatelogs.c | 2 +- support/split-logfile | 2 +- support/suexec.c | 2 +- support/suexec.h | 2 +- 12 files changed, 49 insertions(+), 51 deletions(-) (limited to 'support') diff --git a/support/ab.c b/support/ab.c index f0d804b5cd..48aa24e641 100644 --- a/support/ab.c +++ b/support/ab.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -903,16 +903,16 @@ static void test(void) static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.55 $> apache-2.0"); + printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.56 $> apache-2.0"); printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); - printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n"); + printf("Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/\n"); printf("\n"); } else { printf("

\n"); - printf(" This is ApacheBench, Version %s <%s> apache-2.0
\n", AB_VERSION, "$Revision: 1.55 $"); + printf(" This is ApacheBench, Version %s <%s> apache-2.0
\n", AB_VERSION, "$Revision: 1.56 $"); printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n"); - printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/
\n"); + printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/
\n"); printf("

\n

\n"); } } diff --git a/support/apachectl.in b/support/apachectl.in index 6f9bc6f7b5..136a81cacb 100644 --- a/support/apachectl.in +++ b/support/apachectl.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2000 The Apache Software Foundation. +# Copyright (c) 2000-2001 The Apache Software Foundation. # See license at the end of this file. # # Apache control script designed to allow an easy command line interface @@ -178,7 +178,7 @@ exit $ERROR # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2000 The Apache Software Foundation. All rights +# Copyright (c) 2000-2001 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/support/apxs.in b/support/apxs.in index 11d8fa5543..baac1044d0 100644 --- a/support/apxs.in +++ b/support/apxs.in @@ -2,7 +2,7 @@ # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2000 The Apache Software Foundation. All rights +# Copyright (c) 2000-2001 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/support/dbmmanage b/support/dbmmanage index 57a303ce91..9b6e8bd208 100644 --- a/support/dbmmanage +++ b/support/dbmmanage @@ -1,59 +1,57 @@ #!/usr/local/bin/perl - # ==================================================================== -# Copyright (c) 1995-1999 The Apache Group. All rights reserved. +# The Apache Software License, Version 1.1 +# +# Copyright (c) 2000-2001 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/)." +# 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 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. +# 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 names without prior written -# permission of the Apache Group. +# 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. # -# 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 +# 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 . +# individuals on behalf of the Apache Software Foundation. For more +# information on the Apache Software Foundation, please see +# . +# #for more functionality see the HTTPD::UserAdmin module: # http://www.perl.com/CPAN/modules/by-module/HTTPD/HTTPD-Tools-x.xx.tar.gz diff --git a/support/htdigest.c b/support/htdigest.c index 0dd653a1d2..987bd629a6 100644 --- a/support/htdigest.c +++ b/support/htdigest.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/support/htpasswd.c b/support/htpasswd.c index ed5c071c51..09a690e7db 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/support/log_server_status b/support/log_server_status index b64a3ad477..c5cc5c0eff 100644 --- a/support/log_server_status +++ b/support/log_server_status @@ -2,7 +2,7 @@ # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2000 The Apache Software Foundation. All rights +# Copyright (c) 2000-2001 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/support/logresolve.pl b/support/logresolve.pl index af20662c31..3ab194ee5f 100644 --- a/support/logresolve.pl +++ b/support/logresolve.pl @@ -2,7 +2,7 @@ # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2000 The Apache Software Foundation. All rights +# Copyright (c) 2000-2001 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/support/rotatelogs.c b/support/rotatelogs.c index b7db094e7a..4826808743 100644 --- a/support/rotatelogs.c +++ b/support/rotatelogs.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/support/split-logfile b/support/split-logfile index 993fd5763b..4bfbc5f77d 100644 --- a/support/split-logfile +++ b/support/split-logfile @@ -2,7 +2,7 @@ # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2000 The Apache Software Foundation. All rights +# Copyright (c) 2000-2001 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/support/suexec.c b/support/suexec.c index 3d559cb5e0..c15a266d0c 100644 --- a/support/suexec.c +++ b/support/suexec.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/support/suexec.h b/support/suexec.h index a55349df50..aa95425f57 100644 --- a/support/suexec.h +++ b/support/suexec.h @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.2.3