httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.2/support dbmmanage dbmmanage.new htpasswd.1 httpd.8 httpd_monitor.c log_server_status suexec.c suexec.h
Date Mon, 13 Apr 1998 11:46:25 GMT
coar        98/04/13 04:46:24

  Modified:    .        LICENSE
               htdocs/manual LICENSE expand.pl
               src      alloc.c alloc.h buff.c buff.h conf.h
                        http_conf_globals.h http_config.c http_config.h
                        http_core.c http_core.h http_log.c http_log.h
                        http_main.c http_main.h http_protocol.c
                        http_protocol.h http_request.c http_request.h
                        httpd.h md5.h md5c.c mod_access.c mod_actions.c
                        mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c
                        mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c
                        mod_browser.c mod_cern_meta.c mod_cgi.c
                        mod_digest.c mod_dir.c mod_dld.c mod_env.c
                        mod_expires.c mod_headers.c mod_imap.c
                        mod_include.c mod_info.c mod_log_agent.c
                        mod_log_config.c mod_log_referer.c mod_mime.c
                        mod_negotiation.c mod_rewrite.c mod_rewrite.h
                        mod_status.c mod_userdir.c mod_usertrack.c
                        rfc1413.c rfc1413.h scoreboard.h util.c util_date.c
                        util_date.h util_md5.c util_md5.h util_script.c
                        util_script.h util_snprintf.c
               src/modules/example Makefile mod_example.c
               src/modules/proxy Makefile mod_proxy.c mod_proxy.h
                        proxy_cache.c proxy_connect.c proxy_ftp.c
                        proxy_http.c proxy_util.c
               support  dbmmanage dbmmanage.new htpasswd.1 httpd.8
                        httpd_monitor.c log_server_status suexec.c suexec.h
  Log:
  	Reword the licence text surrounding the use of the name "Apache"
  	in derived products.  This will be in effect as of 1.2.7 and
  	following.  (It's already in place for 1.3 in development.)
  
  Revision  Changes    Path
  1.7       +8 -3      apache-1.2/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/LICENSE,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LICENSE	1997/01/01 18:32:07	1.6
  +++ LICENSE	1998/04/13 11:45:35	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.4       +8 -3      apache-1.2/htdocs/manual/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/htdocs/manual/LICENSE,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LICENSE	1997/01/01 18:32:13	1.3
  +++ LICENSE	1998/04/13 11:45:36	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.4       +8 -3      apache-1.2/htdocs/manual/expand.pl
  
  Index: expand.pl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/htdocs/manual/expand.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- expand.pl	1997/01/01 18:32:14	1.3
  +++ expand.pl	1998/04/13 11:45:36	1.4
  @@ -11,7 +11,7 @@
   # Nov 30, 1996 - Alexei Kosut <akosut@apache.org>
   
   # ====================================================================
  -# Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -32,9 +32,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.30      +8 -3      apache-1.2/src/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/alloc.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- alloc.c	1998/01/30 09:13:47	1.29
  +++ alloc.c	1998/04/13 11:45:36	1.30
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.22      +8 -3      apache-1.2/src/alloc.h
  
  Index: alloc.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/alloc.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- alloc.h	1997/05/27 04:14:19	1.21
  +++ alloc.h	1998/04/13 11:45:37	1.22
  @@ -1,6 +1,6 @@
   
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -21,9 +21,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.31      +8 -3      apache-1.2/src/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/buff.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- buff.c	1998/03/26 18:52:50	1.30
  +++ buff.c	1998/04/13 11:45:37	1.31
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.15      +8 -3      apache-1.2/src/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/buff.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- buff.h	1998/02/07 10:12:20	1.14
  +++ buff.h	1998/04/13 11:45:37	1.15
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.103     +8 -3      apache-1.2/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/conf.h,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- conf.h	1998/03/26 19:24:12	1.102
  +++ conf.h	1998/04/13 11:45:37	1.103
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/http_conf_globals.h
  
  Index: http_conf_globals.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_conf_globals.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_conf_globals.h	1998/01/30 09:13:50	1.10
  +++ http_conf_globals.h	1998/04/13 11:45:37	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.52      +8 -3      apache-1.2/src/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_config.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- http_config.c	1998/02/01 02:47:38	1.51
  +++ http_config.c	1998/04/13 11:45:38	1.52
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.31      +8 -3      apache-1.2/src/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_config.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- http_config.h	1998/01/30 09:13:54	1.30
  +++ http_config.h	1998/04/13 11:45:38	1.31
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.84      +8 -3      apache-1.2/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_core.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- http_core.c	1998/02/01 02:33:36	1.83
  +++ http_core.c	1998/04/13 11:45:38	1.84
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.21      +8 -3      apache-1.2/src/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_core.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- http_core.h	1997/02/17 10:46:07	1.20
  +++ http_core.h	1998/04/13 11:45:38	1.21
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.14      +8 -3      apache-1.2/src/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_log.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- http_log.c	1997/03/22 23:51:01	1.13
  +++ http_log.c	1998/04/13 11:45:38	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/src/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_log.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_log.h	1997/01/01 18:10:19	1.7
  +++ http_log.h	1998/04/13 11:45:39	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.153     +8 -3      apache-1.2/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_main.c,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- http_main.c	1998/03/26 18:59:37	1.152
  +++ http_main.c	1998/04/13 11:45:39	1.153
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_main.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_main.h	1997/04/26 20:20:06	1.10
  +++ http_main.h	1998/04/13 11:45:39	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.135     +8 -3      apache-1.2/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_protocol.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- http_protocol.c	1998/04/01 11:48:12	1.134
  +++ http_protocol.c	1998/04/13 11:45:40	1.135
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.21      +8 -3      apache-1.2/src/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_protocol.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- http_protocol.h	1998/01/30 09:13:57	1.20
  +++ http_protocol.h	1998/04/13 11:45:40	1.21
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.52      +8 -3      apache-1.2/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_request.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- http_request.c	1998/01/30 09:13:58	1.51
  +++ http_request.c	1998/04/13 11:45:41	1.52
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/http_request.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_request.h	1997/01/01 18:10:22	1.10
  +++ http_request.h	1998/04/13 11:45:41	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.115     +8 -3      apache-1.2/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/httpd.h,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- httpd.h	1998/02/19 07:50:35	1.114
  +++ httpd.h	1998/04/13 11:45:41	1.115
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.5       +8 -3      apache-1.2/src/md5.h
  
  Index: md5.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/md5.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- md5.h	1997/01/01 18:10:23	1.4
  +++ md5.h	1998/04/13 11:45:41	1.5
  @@ -29,7 +29,7 @@
    */
   
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -50,9 +50,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.5       +8 -3      apache-1.2/src/md5c.c
  
  Index: md5c.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/md5c.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- md5c.c	1997/01/01 18:10:24	1.4
  +++ md5c.c	1998/04/13 11:45:42	1.5
  @@ -32,7 +32,7 @@
    */
   
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -53,9 +53,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.17      +8 -3      apache-1.2/src/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_access.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_access.c	1997/03/07 14:15:36	1.16
  +++ mod_access.c	1998/04/13 11:45:42	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.13      +8 -3      apache-1.2/src/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_actions.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_actions.c	1997/05/08 11:27:29	1.12
  +++ mod_actions.c	1998/04/13 11:45:42	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.16      +8 -3      apache-1.2/src/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_alias.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_alias.c	1997/04/14 01:09:13	1.15
  +++ mod_alias.c	1998/04/13 11:45:42	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.15      +8 -3      apache-1.2/src/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_asis.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_asis.c	1998/02/01 02:33:37	1.14
  +++ mod_asis.c	1998/04/13 11:45:42	1.15
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.16      +8 -3      apache-1.2/src/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_auth.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_auth.c	1997/04/24 10:16:54	1.15
  +++ mod_auth.c	1998/04/13 11:45:43	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.17      +8 -3      apache-1.2/src/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_auth_anon.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_auth_anon.c	1998/01/30 09:14:01	1.16
  +++ mod_auth_anon.c	1998/04/13 11:45:43	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.13      +8 -3      apache-1.2/src/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_auth_db.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_auth_db.c	1997/04/24 10:16:55	1.12
  +++ mod_auth_db.c	1998/04/13 11:45:43	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.16      +8 -3      apache-1.2/src/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_auth_dbm.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_auth_dbm.c	1997/04/24 10:16:55	1.15
  +++ mod_auth_dbm.c	1998/04/13 11:45:43	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.21      +8 -3      apache-1.2/src/mod_auth_msql.c
  
  Index: mod_auth_msql.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_auth_msql.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_auth_msql.c	1997/03/07 14:15:38	1.20
  +++ mod_auth_msql.c	1998/04/13 11:45:43	1.21
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/mod_browser.c
  
  Index: mod_browser.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_browser.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_browser.c	1998/01/30 09:14:02	1.10
  +++ mod_browser.c	1998/04/13 11:45:43	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_cern_meta.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_cern_meta.c	1998/01/30 09:14:02	1.11
  +++ mod_cern_meta.c	1998/04/13 11:45:44	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.42      +8 -3      apache-1.2/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_cgi.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_cgi.c	1998/02/01 02:47:40	1.41
  +++ mod_cgi.c	1998/04/13 11:45:44	1.42
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.16      +8 -3      apache-1.2/src/mod_digest.c
  
  Index: mod_digest.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_digest.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_digest.c	1998/01/30 09:14:04	1.15
  +++ mod_digest.c	1998/04/13 11:45:44	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.30      +8 -3      apache-1.2/src/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_dir.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_dir.c	1998/02/01 02:47:40	1.29
  +++ mod_dir.c	1998/04/13 11:45:44	1.30
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/src/mod_dld.c
  
  Index: mod_dld.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_dld.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_dld.c	1997/03/07 14:15:40	1.7
  +++ mod_dld.c	1998/04/13 11:45:44	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_env.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_env.c	1997/03/07 14:15:40	1.10
  +++ mod_env.c	1998/04/13 11:45:45	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/src/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_expires.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_expires.c	1997/03/07 14:15:40	1.7
  +++ mod_expires.c	1998/04/13 11:45:45	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.5       +8 -3      apache-1.2/src/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_headers.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_headers.c	1997/03/07 14:15:40	1.4
  +++ mod_headers.c	1998/04/13 11:45:45	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.23      +6 -2      apache-1.2/src/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_imap.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_imap.c	1998/01/30 09:14:05	1.22
  +++ mod_imap.c	1998/04/13 11:45:45	1.23
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -23,7 +23,11 @@
    *    prior written permission. For written permission, please contact
    *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.40      +6 -2      apache-1.2/src/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- mod_include.c	1998/03/18 04:24:00	1.39
  +++ mod_include.c	1998/04/13 11:45:45	1.40
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -23,7 +23,11 @@
    *    prior written permission. For written permission, please contact
    *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.19      +8 -3      apache-1.2/src/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_info.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_info.c	1998/02/01 02:33:39	1.18
  +++ mod_info.c	1998/04/13 11:45:46	1.19
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/mod_log_agent.c
  
  Index: mod_log_agent.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_log_agent.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_log_agent.c	1997/03/22 23:51:02	1.11
  +++ mod_log_agent.c	1998/04/13 11:45:46	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.29      +8 -3      apache-1.2/src/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_log_config.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_log_config.c	1997/05/04 20:47:47	1.28
  +++ mod_log_config.c	1998/04/13 11:45:46	1.29
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/mod_log_referer.c
  
  Index: mod_log_referer.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_log_referer.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_log_referer.c	1997/03/22 23:51:03	1.11
  +++ mod_log_referer.c	1998/04/13 11:45:46	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.18      +8 -3      apache-1.2/src/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_mime.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_mime.c	1997/03/22 23:51:03	1.17
  +++ mod_mime.c	1998/04/13 11:45:47	1.18
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.42      +8 -3      apache-1.2/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_negotiation.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_negotiation.c	1998/01/30 09:14:07	1.41
  +++ mod_negotiation.c	1998/04/13 11:45:47	1.42
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.32      +8 -3      apache-1.2/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_rewrite.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_rewrite.c	1998/02/14 02:51:37	1.31
  +++ mod_rewrite.c	1998/04/13 11:45:47	1.32
  @@ -1,6 +1,6 @@
    
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -21,9 +21,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.24      +8 -3      apache-1.2/src/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_rewrite.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_rewrite.h	1998/01/30 09:14:09	1.23
  +++ mod_rewrite.h	1998/04/13 11:45:47	1.24
  @@ -1,6 +1,6 @@
   
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -21,9 +21,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.49      +8 -3      apache-1.2/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_status.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mod_status.c	1998/01/30 09:14:09	1.48
  +++ mod_status.c	1998/04/13 11:45:48	1.49
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.17      +8 -3      apache-1.2/src/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_userdir.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_userdir.c	1998/02/14 03:39:18	1.16
  +++ mod_userdir.c	1998/04/13 11:45:48	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_usertrack.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_usertrack.c	1998/01/30 09:14:11	1.11
  +++ mod_usertrack.c	1998/04/13 11:45:48	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/rfc1413.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- rfc1413.c	1997/05/29 18:29:12	1.11
  +++ rfc1413.c	1998/04/13 11:45:48	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.5       +8 -3      apache-1.2/src/rfc1413.h
  
  Index: rfc1413.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/rfc1413.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rfc1413.h	1997/01/01 18:10:43	1.4
  +++ rfc1413.h	1998/04/13 11:45:48	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.23      +8 -3      apache-1.2/src/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/scoreboard.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- scoreboard.h	1998/01/30 09:14:12	1.22
  +++ scoreboard.h	1998/04/13 11:45:49	1.23
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.56      +8 -3      apache-1.2/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- util.c	1998/03/10 06:16:57	1.55
  +++ util.c	1998/04/13 11:45:49	1.56
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.4       +8 -3      apache-1.2/src/util_date.c
  
  Index: util_date.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_date.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- util_date.c	1997/01/01 18:10:45	1.3
  +++ util_date.c	1998/04/13 11:45:49	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.3       +8 -3      apache-1.2/src/util_date.h
  
  Index: util_date.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_date.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_date.h	1997/01/01 18:10:45	1.2
  +++ util_date.h	1998/04/13 11:45:49	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/src/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_md5.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- util_md5.c	1997/01/01 18:10:46	1.7
  +++ util_md5.c	1998/04/13 11:45:49	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.6       +8 -3      apache-1.2/src/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_md5.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_md5.h	1997/01/01 18:10:46	1.5
  +++ util_md5.h	1998/04/13 11:45:49	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.60      +8 -3      apache-1.2/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_script.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- util_script.c	1998/01/30 09:14:13	1.59
  +++ util_script.c	1998/04/13 11:45:50	1.60
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.17      +8 -3      apache-1.2/src/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_script.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- util_script.h	1997/04/29 03:41:13	1.16
  +++ util_script.h	1998/04/13 11:45:50	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.6       +8 -3      apache-1.2/src/util_snprintf.c
  
  Index: util_snprintf.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/util_snprintf.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_snprintf.c	1997/02/08 01:33:56	1.5
  +++ util_snprintf.c	1998/04/13 11:45:50	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.2       +8 -3      apache-1.2/src/modules/example/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/example/Makefile,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile	1997/04/11 22:12:33	1.1
  +++ Makefile	1998/04/13 11:46:17	1.2
  @@ -1,5 +1,5 @@
   # ====================================================================
  -# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.11      +8 -3      apache-1.2/src/modules/example/mod_example.c
  
  Index: mod_example.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/example/mod_example.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_example.c	1997/05/05 20:41:55	1.10
  +++ mod_example.c	1998/04/13 11:46:17	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.12      +8 -3      apache-1.2/src/modules/proxy/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/Makefile,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile	1997/03/18 10:23:56	1.11
  +++ Makefile	1998/04/13 11:46:18	1.12
  @@ -1,5 +1,5 @@
   # ====================================================================
  -# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.14      +8 -3      apache-1.2/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_proxy.c	1998/02/01 02:47:45	1.13
  +++ mod_proxy.c	1998/04/13 11:46:18	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.13      +8 -3      apache-1.2/src/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/mod_proxy.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_proxy.h	1998/01/30 09:14:26	1.12
  +++ mod_proxy.h	1998/04/13 11:46:18	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.15      +8 -3      apache-1.2/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- proxy_cache.c	1998/01/30 09:14:27	1.14
  +++ proxy_cache.c	1998/04/13 11:46:19	1.15
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.9       +8 -3      apache-1.2/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- proxy_connect.c	1997/04/24 23:21:35	1.8
  +++ proxy_connect.c	1998/04/13 11:46:19	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.23      +8 -3      apache-1.2/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- proxy_ftp.c	1998/01/30 09:14:27	1.22
  +++ proxy_ftp.c	1998/04/13 11:46:19	1.23
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.20      +8 -3      apache-1.2/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- proxy_http.c	1998/03/16 19:38:51	1.19
  +++ proxy_http.c	1998/04/13 11:46:19	1.20
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.19      +8 -3      apache-1.2/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- proxy_util.c	1998/01/30 09:14:28	1.18
  +++ proxy_util.c	1998/04/13 11:46:19	1.19
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1996,1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1996-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.7       +8 -3      apache-1.2/support/dbmmanage
  
  Index: dbmmanage
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/dbmmanage,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dbmmanage	1997/01/01 18:26:15	1.6
  +++ dbmmanage	1998/04/13 11:46:21	1.7
  @@ -1,7 +1,7 @@
   #!/usr/local/bin/perl
   
   # ====================================================================
  -# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -22,9 +22,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/support/dbmmanage.new
  
  Index: dbmmanage.new
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/dbmmanage.new,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dbmmanage.new	1997/02/19 08:08:37	1.7
  +++ dbmmanage.new	1998/04/13 11:46:22	1.8
  @@ -1,7 +1,7 @@
   #!/usr/local/bin/perl
   
   # ====================================================================
  -# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -22,9 +22,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.2       +8 -3      apache-1.2/support/htpasswd.1
  
  Index: htpasswd.1
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/htpasswd.1,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htpasswd.1	1997/02/20 10:52:33	1.1
  +++ htpasswd.1	1998/04/13 11:46:22	1.2
  @@ -1,5 +1,5 @@
   .TH htpasswd 1 "February 1997"
  -.\" Copyright (c) 1997 The Apache Group. All rights reserved.
  +.\" Copyright (c) 1997-1998 The Apache Group. All rights reserved.
   .\"
   .\" Redistribution and use in source and binary forms, with or without
   .\" modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
   .\"
   .\" 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.
  +.\"    prior written permission. For written permission, please contact
  +.\"    apache@apache.org.
   .\"
  -.\" 5. Redistributions of any form whatsoever must retain the following
  +.\" 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/)."
  
  
  
  1.2       +8 -3      apache-1.2/support/httpd.8
  
  Index: httpd.8
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/httpd.8,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- httpd.8	1997/02/20 10:52:33	1.1
  +++ httpd.8	1998/04/13 11:46:22	1.2
  @@ -1,6 +1,6 @@
   .TH httpd 8 "February 1997"
   .\" Copyright (c) 1995-1997 David Robinson. All rights reserved.
  -.\" Copyright (c) 1997 The Apache Group. All rights reserved.
  +.\" Copyright (c) 1997-1998 The Apache Group. All rights reserved.
   .\"
   .\" Redistribution and use in source and binary forms, with or without
   .\" modification, are permitted provided that the following conditions
  @@ -21,9 +21,14 @@
   .\"
   .\" 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.
  +.\"    prior written permission. For written permission, please contact
  +.\"    apache@apache.org.
   .\"
  -.\" 5. Redistributions of any form whatsoever must retain the following
  +.\" 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/)."
  
  
  
  1.8       +8 -3      apache-1.2/support/httpd_monitor.c
  
  Index: httpd_monitor.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/httpd_monitor.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- httpd_monitor.c	1997/02/03 01:36:45	1.7
  +++ httpd_monitor.c	1998/04/13 11:46:22	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.7       +8 -3      apache-1.2/support/log_server_status
  
  Index: log_server_status
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/log_server_status,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- log_server_status	1997/01/01 18:26:17	1.6
  +++ log_server_status	1998/04/13 11:46:22	1.7
  @@ -1,7 +1,7 @@
   #!/usr/local/bin/perl
   
   # ====================================================================
  -# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  +# Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
  @@ -22,9 +22,14 @@
   #
   # 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.
  +#    prior written permission. For written permission, please contact
  +#    apache@apache.org.
   #
  -# 5. Redistributions of any form whatsoever must retain the following
  +# 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/)."
  
  
  
  1.25      +8 -3      apache-1.2/support/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/suexec.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- suexec.c	1998/01/30 14:45:44	1.24
  +++ suexec.c	1998/04/13 11:46:23	1.25
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  
  1.10      +8 -3      apache-1.2/support/suexec.h
  
  Index: suexec.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/support/suexec.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- suexec.h	1997/05/10 05:06:17	1.9
  +++ suexec.h	1998/04/13 11:46:23	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
  + * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -20,9 +20,14 @@
    *
    * 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.
  + *    prior written permission. For written permission, please contact
  + *    apache@apache.org.
    *
  - * 5. Redistributions of any form whatsoever must retain the following
  + * 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/)."
  
  
  

Mime
View raw message