summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2005-06-14 13:54:34 +0000
committerJoe Orton <jorton@apache.org>2005-06-14 13:54:34 +0000
commit9687f8c6a7653267aef7c445cf1bd29378416543 (patch)
tree82f0d788cd22a528cdb10349d9fffef0594fa9d3
parent6a23d6ebeb82bb83f7ab3ebbd10f07dc77423939 (diff)
downloadhttpd-9687f8c6a7653267aef7c445cf1bd29378416543.tar.gz
Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xbuild/bsd_makefile3
-rw-r--r--build/build-modules-c.awk3
-rwxr-xr-xbuild/httpd_roll_release3
-rw-r--r--build/library.mk3
-rw-r--r--build/ltlib.mk3
-rw-r--r--build/make_exports.awk3
-rw-r--r--build/make_nw_export.awk3
-rw-r--r--build/make_var_export.awk3
-rw-r--r--build/mkconfNW.awk3
-rw-r--r--build/nw_ver.awk3
-rw-r--r--build/program.mk3
-rwxr-xr-xbuild/rpm/httpd.init3
-rwxr-xr-xbuild/sysv_makefile3
-rw-r--r--build/win32/win32ver.awk3
-rwxr-xr-xbuildconf3
-rw-r--r--include/ap_config_layout.h.in3
-rw-r--r--modules/debug/mod_dumpio.c3
-rw-r--r--modules/experimental/mod_filter.c3
-rw-r--r--modules/loggers/mod_log_forensic.c3
-rw-r--r--modules/mappers/mod_so.h3
-rw-r--r--modules/metadata/mod_version.c3
-rw-r--r--modules/ssl/config.m43
-rw-r--r--modules/ssl/ssl_expr_parse.y3
-rw-r--r--modules/ssl/ssl_expr_scan.l3
-rw-r--r--modules/ssl/ssl_scache_dc.c3
-rwxr-xr-xsupport/list_hooks.pl3
-rw-r--r--support/win32/ApacheMonitor.rc3
-rw-r--r--test/check_chunked3
28 files changed, 56 insertions, 28 deletions
diff --git a/build/bsd_makefile b/build/bsd_makefile
index c3b8131101..d4e81fe703 100755
--- a/build/bsd_makefile
+++ b/build/bsd_makefile
@@ -1,6 +1,7 @@
#! /bin/sh
#
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/build-modules-c.awk b/build/build-modules-c.awk
index fda31c2860..b696a52680 100644
--- a/build/build-modules-c.awk
+++ b/build/build-modules-c.awk
@@ -1,4 +1,5 @@
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/httpd_roll_release b/build/httpd_roll_release
index 67c3443c76..2ef09f24aa 100755
--- a/build/httpd_roll_release
+++ b/build/httpd_roll_release
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/library.mk b/build/library.mk
index 6cee6d2b30..62e2d4816b 100644
--- a/build/library.mk
+++ b/build/library.mk
@@ -1,4 +1,5 @@
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/ltlib.mk b/build/ltlib.mk
index 5ab0750498..51f5ad2cd1 100644
--- a/build/ltlib.mk
+++ b/build/ltlib.mk
@@ -1,4 +1,5 @@
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/make_exports.awk b/build/make_exports.awk
index aa69b257ad..2b1b1d4ea2 100644
--- a/build/make_exports.awk
+++ b/build/make_exports.awk
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 4640ff696e..ac7f97323b 100644
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/make_var_export.awk b/build/make_var_export.awk
index be150d4710..374afa381e 100644
--- a/build/make_var_export.awk
+++ b/build/make_var_export.awk
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index b65c1682a5..9cd9389041 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 59304a244c..ba6d298f4c 100644
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/program.mk b/build/program.mk
index 3b5d2abef2..af376139ef 100644
--- a/build/program.mk
+++ b/build/program.mk
@@ -1,4 +1,5 @@
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/rpm/httpd.init b/build/rpm/httpd.init
index 218b69d1b1..38f2a92b52 100755
--- a/build/rpm/httpd.init
+++ b/build/rpm/httpd.init
@@ -1,6 +1,7 @@
#!/bin/bash
#
-# Copyright 2003-2004 The Apache Software Foundation
+# Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/sysv_makefile b/build/sysv_makefile
index 4d2ddae282..63530755f9 100755
--- a/build/sysv_makefile
+++ b/build/sysv_makefile
@@ -1,6 +1,7 @@
#! /bin/sh
#
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk
index 5b1bc1e3af..739bf87708 100644
--- a/build/win32/win32ver.awk
+++ b/build/win32/win32ver.awk
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/buildconf b/buildconf
index 89cff05b7f..34f01e2c29 100755
--- a/buildconf
+++ b/buildconf
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/include/ap_config_layout.h.in b/include/ap_config_layout.h.in
index 74397ffe96..185494de26 100644
--- a/include/ap_config_layout.h.in
+++ b/include/ap_config_layout.h.in
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/debug/mod_dumpio.c b/modules/debug/mod_dumpio.c
index 7af9bbefb2..fc505ef5c3 100644
--- a/modules/debug/mod_dumpio.c
+++ b/modules/debug/mod_dumpio.c
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/experimental/mod_filter.c b/modules/experimental/mod_filter.c
index dbaad2db24..fc2056d18e 100644
--- a/modules/experimental/mod_filter.c
+++ b/modules/experimental/mod_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
index 34387d7127..f8cabfa97b 100644
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_so.h b/modules/mappers/mod_so.h
index 514ba6c932..da77d18a7f 100644
--- a/modules/mappers/mod_so.h
+++ b/modules/mappers/mod_so.h
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_version.c b/modules/metadata/mod_version.c
index 4a583bc87f..47b938a73b 100644
--- a/modules/metadata/mod_version.c
+++ b/modules/metadata/mod_version.c
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4
index 7242f76ed9..06479a9e11 100644
--- a/modules/ssl/config.m4
+++ b/modules/ssl/config.m4
@@ -1,4 +1,5 @@
-dnl Copyright 2001-2004 The Apache Software Foundation
+dnl Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+dnl applicable.
dnl Licensed under the Apache License, Version 2.0 (the "License");
dnl you may not use this file except in compliance with the License.
dnl You may obtain a copy of the License at
diff --git a/modules/ssl/ssl_expr_parse.y b/modules/ssl/ssl_expr_parse.y
index 3daf31ac4e..0c2bee4d29 100644
--- a/modules/ssl/ssl_expr_parse.y
+++ b/modules/ssl/ssl_expr_parse.y
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_expr_scan.l b/modules/ssl/ssl_expr_scan.l
index da172fd3a5..6e1163e409 100644
--- a/modules/ssl/ssl_expr_scan.l
+++ b/modules/ssl/ssl_expr_scan.l
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_scache_dc.c b/modules/ssl/ssl_scache_dc.c
index d8aa1eb2a9..3d7d61c384 100644
--- a/modules/ssl/ssl_scache_dc.c
+++ b/modules/ssl/ssl_scache_dc.c
@@ -1,4 +1,5 @@
-/* Copyright 2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/support/list_hooks.pl b/support/list_hooks.pl
index 8d54778a25..33e34bbafc 100755
--- a/support/list_hooks.pl
+++ b/support/list_hooks.pl
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
#
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/support/win32/ApacheMonitor.rc b/support/win32/ApacheMonitor.rc
index 3784b0ff26..8fc8c80a7f 100644
--- a/support/win32/ApacheMonitor.rc
+++ b/support/win32/ApacheMonitor.rc
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/test/check_chunked b/test/check_chunked
index 7dc5fa287d..8a51f12d0f 100644
--- a/test/check_chunked
+++ b/test/check_chunked
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
#
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.