summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2005-06-14 14:22:46 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2005-06-14 14:22:46 +0000
commit66e201f131a4a833f47dc2f87b0f0f31f5948a26 (patch)
treed87b16848f72ee85fdec9526f0d9fee60fc3612a
parente3d65e4dfe30bb519a3c4c3157a943ab51ee9663 (diff)
downloadlibapr-66e201f131a4a833f47dc2f87b0f0f31f5948a26.tar.gz
Update copyright notices for 2005.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.1.x@190596 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--apr-config.in3
-rw-r--r--atomic/netware/apr_atomic.c3
-rw-r--r--atomic/os390/atomic.c3
-rw-r--r--atomic/unix/apr_atomic.c3
-rw-r--r--atomic/win32/apr_atomic.c3
-rwxr-xr-xbuild/PrintPath3
-rw-r--r--build/aplibtool.c3
-rw-r--r--build/apr_rules.mk.in3
-rw-r--r--build/jlibtool.c3
-rwxr-xr-xbuild/pkg/buildpkg.sh3
-rwxr-xr-xbuildconf3
-rw-r--r--dso/aix/dso.c3
-rw-r--r--dso/beos/dso.c3
-rw-r--r--dso/netware/dso.c3
-rw-r--r--dso/os2/dso.c3
-rw-r--r--dso/os390/dso.c3
-rw-r--r--dso/unix/dso.c3
-rw-r--r--dso/win32/dso.c3
-rw-r--r--file_io/netware/filestat.c3
-rw-r--r--file_io/netware/filesys.c3
-rw-r--r--file_io/netware/flock.c3
-rw-r--r--file_io/netware/mktemp.c3
-rw-r--r--file_io/netware/pipe.c3
-rw-r--r--file_io/os2/dir.c3
-rw-r--r--file_io/os2/dir_make_recurse.c3
-rw-r--r--file_io/os2/fileacc.c3
-rw-r--r--file_io/os2/filedup.c3
-rw-r--r--file_io/os2/filestat.c3
-rw-r--r--file_io/os2/filesys.c3
-rw-r--r--file_io/os2/flock.c3
-rw-r--r--file_io/os2/maperrorcode.c3
-rw-r--r--file_io/os2/open.c3
-rw-r--r--file_io/os2/pipe.c3
-rw-r--r--file_io/os2/readwrite.c3
-rw-r--r--file_io/os2/seek.c3
-rw-r--r--file_io/unix/copy.c3
-rw-r--r--file_io/unix/dir.c3
-rw-r--r--file_io/unix/fileacc.c3
-rw-r--r--file_io/unix/filedup.c3
-rw-r--r--file_io/unix/filepath.c3
-rw-r--r--file_io/unix/filepath_util.c3
-rw-r--r--file_io/unix/filestat.c3
-rw-r--r--file_io/unix/flock.c3
-rw-r--r--file_io/unix/fullrw.c3
-rw-r--r--file_io/unix/mktemp.c3
-rw-r--r--file_io/unix/open.c3
-rw-r--r--file_io/unix/pipe.c3
-rw-r--r--file_io/unix/readwrite.c3
-rw-r--r--file_io/unix/seek.c3
-rw-r--r--file_io/unix/tempdir.c3
-rw-r--r--file_io/win32/dir.c3
-rw-r--r--file_io/win32/filedup.c3
-rw-r--r--file_io/win32/filepath.c3
-rw-r--r--file_io/win32/filestat.c3
-rw-r--r--file_io/win32/filesys.c3
-rw-r--r--file_io/win32/flock.c3
-rw-r--r--file_io/win32/open.c3
-rw-r--r--file_io/win32/pipe.c3
-rw-r--r--file_io/win32/readwrite.c3
-rw-r--r--file_io/win32/seek.c3
-rw-r--r--include/apr.h.in3
-rw-r--r--include/apr.hnw3
-rw-r--r--include/apr.hw3
-rw-r--r--include/apr_allocator.h3
-rw-r--r--include/apr_atomic.h3
-rw-r--r--include/apr_dso.h3
-rw-r--r--include/apr_env.h3
-rw-r--r--include/apr_errno.h3
-rw-r--r--include/apr_file_info.h3
-rw-r--r--include/apr_file_io.h3
-rw-r--r--include/apr_general.h3
-rw-r--r--include/apr_getopt.h3
-rw-r--r--include/apr_global_mutex.h3
-rw-r--r--include/apr_hash.h3
-rw-r--r--include/apr_inherit.h3
-rw-r--r--include/apr_lib.h3
-rw-r--r--include/apr_mmap.h3
-rw-r--r--include/apr_network_io.h3
-rw-r--r--include/apr_poll.h3
-rw-r--r--include/apr_pools.h3
-rw-r--r--include/apr_portable.h3
-rw-r--r--include/apr_proc_mutex.h3
-rw-r--r--include/apr_random.h3
-rw-r--r--include/apr_ring.h3
-rw-r--r--include/apr_shm.h3
-rw-r--r--include/apr_signal.h3
-rw-r--r--include/apr_strings.h3
-rw-r--r--include/apr_support.h3
-rw-r--r--include/apr_tables.h3
-rw-r--r--include/apr_thread_cond.h3
-rw-r--r--include/apr_thread_mutex.h3
-rw-r--r--include/apr_thread_proc.h3
-rw-r--r--include/apr_thread_rwlock.h3
-rw-r--r--include/apr_time.h3
-rw-r--r--include/apr_user.h3
-rw-r--r--include/apr_version.h3
-rw-r--r--include/apr_want.h3
-rw-r--r--include/arch/aix/apr_arch_dso.h3
-rw-r--r--include/arch/apr_private_common.h3
-rw-r--r--include/arch/beos/apr_arch_dso.h3
-rw-r--r--include/arch/beos/apr_arch_proc_mutex.h3
-rw-r--r--include/arch/beos/apr_arch_thread_cond.h3
-rw-r--r--include/arch/beos/apr_arch_thread_mutex.h3
-rw-r--r--include/arch/beos/apr_arch_thread_rwlock.h3
-rw-r--r--include/arch/beos/apr_arch_threadproc.h3
-rw-r--r--include/arch/netware/apr_arch_dso.h3
-rw-r--r--include/arch/netware/apr_arch_file_io.h3
-rw-r--r--include/arch/netware/apr_arch_global_mutex.h3
-rw-r--r--include/arch/netware/apr_arch_internal_time.h3
-rw-r--r--include/arch/netware/apr_arch_networkio.h3
-rw-r--r--include/arch/netware/apr_arch_proc_mutex.h3
-rw-r--r--include/arch/netware/apr_arch_thread_cond.h3
-rw-r--r--include/arch/netware/apr_arch_thread_mutex.h3
-rw-r--r--include/arch/netware/apr_arch_thread_rwlock.h3
-rw-r--r--include/arch/netware/apr_arch_threadproc.h3
-rw-r--r--include/arch/netware/apr_private.h3
-rw-r--r--include/arch/os2/apr_arch_dso.h3
-rw-r--r--include/arch/os2/apr_arch_file_io.h3
-rw-r--r--include/arch/os2/apr_arch_networkio.h3
-rw-r--r--include/arch/os2/apr_arch_os2calls.h3
-rw-r--r--include/arch/os2/apr_arch_proc_mutex.h3
-rw-r--r--include/arch/os2/apr_arch_thread_cond.h3
-rw-r--r--include/arch/os2/apr_arch_thread_mutex.h3
-rw-r--r--include/arch/os2/apr_arch_thread_rwlock.h3
-rw-r--r--include/arch/os2/apr_arch_threadproc.h3
-rw-r--r--include/arch/os390/apr_arch_dso.h3
-rw-r--r--include/arch/unix/apr_arch_dso.h3
-rw-r--r--include/arch/unix/apr_arch_file_io.h3
-rw-r--r--include/arch/unix/apr_arch_global_mutex.h3
-rw-r--r--include/arch/unix/apr_arch_inherit.h3
-rw-r--r--include/arch/unix/apr_arch_internal_time.h3
-rw-r--r--include/arch/unix/apr_arch_misc.h3
-rw-r--r--include/arch/unix/apr_arch_networkio.h3
-rw-r--r--include/arch/unix/apr_arch_poll_private.h3
-rw-r--r--include/arch/unix/apr_arch_proc_mutex.h3
-rw-r--r--include/arch/unix/apr_arch_shm.h3
-rw-r--r--include/arch/unix/apr_arch_thread_cond.h3
-rw-r--r--include/arch/unix/apr_arch_thread_mutex.h3
-rw-r--r--include/arch/unix/apr_arch_thread_rwlock.h3
-rw-r--r--include/arch/unix/apr_arch_threadproc.h3
-rw-r--r--include/arch/win32/apr_arch_atime.h3
-rw-r--r--include/arch/win32/apr_arch_dso.h3
-rw-r--r--include/arch/win32/apr_arch_file_io.h3
-rw-r--r--include/arch/win32/apr_arch_inherit.h3
-rw-r--r--include/arch/win32/apr_arch_misc.h3
-rw-r--r--include/arch/win32/apr_arch_networkio.h3
-rw-r--r--include/arch/win32/apr_arch_proc_mutex.h3
-rw-r--r--include/arch/win32/apr_arch_thread_cond.h3
-rw-r--r--include/arch/win32/apr_arch_thread_mutex.h3
-rw-r--r--include/arch/win32/apr_arch_thread_rwlock.h3
-rw-r--r--include/arch/win32/apr_arch_threadproc.h3
-rw-r--r--include/arch/win32/apr_arch_utf8.h3
-rw-r--r--include/arch/win32/apr_dbg_win32_handles.h3
-rw-r--r--include/arch/win32/apr_private.h3
-rw-r--r--locks/beos/proc_mutex.c3
-rw-r--r--locks/beos/thread_cond.c3
-rw-r--r--locks/beos/thread_mutex.c3
-rw-r--r--locks/beos/thread_rwlock.c3
-rw-r--r--locks/netware/proc_mutex.c3
-rw-r--r--locks/netware/thread_cond.c3
-rw-r--r--locks/netware/thread_mutex.c3
-rw-r--r--locks/netware/thread_rwlock.c3
-rw-r--r--locks/os2/proc_mutex.c3
-rw-r--r--locks/os2/thread_cond.c3
-rw-r--r--locks/os2/thread_mutex.c3
-rw-r--r--locks/os2/thread_rwlock.c3
-rw-r--r--locks/unix/global_mutex.c3
-rw-r--r--locks/unix/proc_mutex.c3
-rw-r--r--locks/unix/thread_cond.c3
-rw-r--r--locks/unix/thread_mutex.c3
-rw-r--r--locks/unix/thread_rwlock.c3
-rw-r--r--locks/win32/proc_mutex.c3
-rw-r--r--locks/win32/thread_cond.c3
-rw-r--r--locks/win32/thread_mutex.c3
-rw-r--r--locks/win32/thread_rwlock.c3
-rw-r--r--memory/unix/apr_pools.c3
-rw-r--r--misc/netware/charset.c3
-rw-r--r--misc/netware/rand.c3
-rw-r--r--misc/netware/start.c3
-rw-r--r--misc/unix/charset.c3
-rw-r--r--misc/unix/env.c3
-rw-r--r--misc/unix/errorcodes.c3
-rw-r--r--misc/unix/otherchild.c3
-rw-r--r--misc/unix/rand.c3
-rw-r--r--misc/unix/randbyte_os2.inc3
-rw-r--r--misc/unix/start.c3
-rw-r--r--misc/unix/version.c3
-rw-r--r--misc/win32/apr_app.c3
-rw-r--r--misc/win32/charset.c3
-rw-r--r--misc/win32/env.c3
-rw-r--r--misc/win32/internal.c3
-rw-r--r--misc/win32/misc.c3
-rw-r--r--misc/win32/rand.c3
-rw-r--r--misc/win32/start.c3
-rw-r--r--misc/win32/utf8.c3
-rw-r--r--mmap/unix/common.c3
-rw-r--r--mmap/unix/mmap.c3
-rw-r--r--mmap/win32/mmap.c3
-rw-r--r--network_io/beos/sendrecv.c3
-rw-r--r--network_io/os2/os2calls.c3
-rw-r--r--network_io/os2/sendrecv.c3
-rw-r--r--network_io/os2/sendrecv_udp.c3
-rw-r--r--network_io/os2/sockets.c3
-rw-r--r--network_io/os2/sockopt.c3
-rw-r--r--network_io/unix/multicast.c3
-rw-r--r--network_io/unix/sendrecv.c3
-rw-r--r--network_io/unix/sockaddr.c3
-rw-r--r--network_io/unix/sockets.c3
-rw-r--r--network_io/unix/sockopt.c3
-rw-r--r--network_io/win32/sendrecv.c3
-rw-r--r--network_io/win32/sockets.c3
-rw-r--r--network_io/win32/sockopt.c3
-rw-r--r--passwd/apr_getpass.c3
-rw-r--r--poll/os2/poll.c3
-rw-r--r--poll/os2/pollset.c3
-rw-r--r--poll/unix/epoll.c3
-rw-r--r--poll/unix/kqueue.c3
-rw-r--r--poll/unix/poll.c3
-rw-r--r--poll/unix/port.c3
-rw-r--r--poll/unix/select.c3
-rw-r--r--random/unix/apr_random.c3
-rw-r--r--random/unix/sha2.c3
-rw-r--r--random/unix/sha2.h3
-rw-r--r--shmem/beos/shm.c3
-rw-r--r--shmem/os2/shm.c3
-rw-r--r--shmem/unix/shm.c3
-rw-r--r--shmem/win32/shm.c3
-rw-r--r--strings/apr_cpystrn.c3
-rw-r--r--strings/apr_snprintf.c3
-rw-r--r--strings/apr_strings.c3
-rw-r--r--strings/apr_strtok.c3
-rw-r--r--support/unix/waitio.c3
-rw-r--r--tables/apr_hash.c3
-rw-r--r--tables/apr_tables.c3
-rw-r--r--test/abts_tests.h3
-rw-r--r--test/globalmutexchild.c3
-rw-r--r--test/internal/testregex.c3
-rw-r--r--test/internal/testucs.c3
-rw-r--r--test/mod_test.c3
-rw-r--r--test/readchild.c3
-rw-r--r--test/sendfile.c3
-rw-r--r--test/sockchild.c3
-rw-r--r--test/testargs.c3
-rw-r--r--test/testatomic.c3
-rw-r--r--test/testdir.c3
-rw-r--r--test/testdso.c3
-rw-r--r--test/testdup.c3
-rw-r--r--test/testenv.c3
-rw-r--r--test/testfile.c3
-rw-r--r--test/testfilecopy.c3
-rw-r--r--test/testfileinfo.c3
-rw-r--r--test/testflock.c3
-rw-r--r--test/testflock.h3
-rw-r--r--test/testfmt.c3
-rw-r--r--test/testfnmatch.c3
-rw-r--r--test/testglobalmutex.c3
-rw-r--r--test/testglobalmutex.h3
-rw-r--r--test/testhash.c3
-rw-r--r--test/testipsub.c3
-rw-r--r--test/testlfs.c3
-rw-r--r--test/testlock.c3
-rw-r--r--test/testlockperf.c3
-rw-r--r--test/testmmap.c3
-rw-r--r--test/testmutexscope.c3
-rw-r--r--test/testnames.c3
-rw-r--r--test/testoc.c3
-rw-r--r--test/testpath.c3
-rw-r--r--test/testpipe.c3
-rw-r--r--test/testpoll.c3
-rw-r--r--test/testpools.c3
-rw-r--r--test/testproc.c3
-rw-r--r--test/testprocmutex.c3
-rw-r--r--test/testrand.c3
-rw-r--r--test/testrand2.c3
-rw-r--r--test/testshm.c3
-rw-r--r--test/testshm.h3
-rw-r--r--test/testshmconsumer.c3
-rw-r--r--test/testshmproducer.c3
-rw-r--r--test/testsleep.c3
-rw-r--r--test/testsock.c3
-rw-r--r--test/testsock.h3
-rw-r--r--test/testsockets.c3
-rw-r--r--test/testsockopt.c3
-rw-r--r--test/teststr.c3
-rw-r--r--test/teststrnatcmp.c3
-rw-r--r--test/testtable.c3
-rw-r--r--test/testtemp.c3
-rw-r--r--test/testthread.c3
-rw-r--r--test/testtime.c3
-rw-r--r--test/testud.c3
-rw-r--r--test/testuser.c3
-rw-r--r--test/testutil.c3
-rw-r--r--test/testutil.h3
-rw-r--r--test/testvsn.c3
-rw-r--r--test/tryread.c3
-rw-r--r--threadproc/beos/apr_proc_stub.c3
-rw-r--r--threadproc/beos/proc.c3
-rw-r--r--threadproc/beos/thread.c3
-rw-r--r--threadproc/beos/threadpriv.c3
-rw-r--r--threadproc/beos/threadproc_common.c3
-rw-r--r--threadproc/netware/proc.c3
-rw-r--r--threadproc/netware/procsup.c3
-rw-r--r--threadproc/netware/signals.c3
-rw-r--r--threadproc/netware/thread.c3
-rw-r--r--threadproc/netware/threadpriv.c3
-rw-r--r--threadproc/os2/proc.c3
-rw-r--r--threadproc/os2/thread.c3
-rw-r--r--threadproc/os2/threadpriv.c3
-rw-r--r--threadproc/unix/proc.c3
-rw-r--r--threadproc/unix/procsup.c3
-rw-r--r--threadproc/unix/thread.c3
-rw-r--r--threadproc/unix/threadpriv.c3
-rw-r--r--threadproc/win32/proc.c3
-rw-r--r--threadproc/win32/signals.c3
-rw-r--r--threadproc/win32/thread.c3
-rw-r--r--threadproc/win32/threadpriv.c3
-rw-r--r--time/win32/access.c3
-rw-r--r--time/win32/time.c3
-rw-r--r--time/win32/timestr.c3
-rw-r--r--user/netware/groupinfo.c3
-rw-r--r--user/netware/userinfo.c3
-rw-r--r--user/unix/groupinfo.c3
-rw-r--r--user/unix/userinfo.c3
-rw-r--r--user/win32/groupinfo.c3
-rw-r--r--user/win32/userinfo.c3
325 files changed, 650 insertions, 325 deletions
diff --git a/apr-config.in b/apr-config.in
index d2bca990c..ccca1c8a3 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -1,5 +1,6 @@
#!/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/atomic/netware/apr_atomic.c b/atomic/netware/apr_atomic.c
index 069b1bd16..78d14a65c 100644
--- a/atomic/netware/apr_atomic.c
+++ b/atomic/netware/apr_atomic.c
@@ -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/atomic/os390/atomic.c b/atomic/os390/atomic.c
index 7c8fa484c..675a04577 100644
--- a/atomic/os390/atomic.c
+++ b/atomic/os390/atomic.c
@@ -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/atomic/unix/apr_atomic.c b/atomic/unix/apr_atomic.c
index bf457c1ea..5484eba0a 100644
--- a/atomic/unix/apr_atomic.c
+++ b/atomic/unix/apr_atomic.c
@@ -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/atomic/win32/apr_atomic.c b/atomic/win32/apr_atomic.c
index b42a2028e..dd00abd93 100644
--- a/atomic/win32/apr_atomic.c
+++ b/atomic/win32/apr_atomic.c
@@ -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/PrintPath b/build/PrintPath
index 0e512250f..eaa6c1c97 100755
--- a/build/PrintPath
+++ b/build/PrintPath
@@ -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/build/aplibtool.c b/build/aplibtool.c
index 1990d7d79..22a316ace 100644
--- a/build/aplibtool.c
+++ b/build/aplibtool.c
@@ -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/apr_rules.mk.in b/build/apr_rules.mk.in
index b95982f5a..dc11c7125 100644
--- a/build/apr_rules.mk.in
+++ b/build/apr_rules.mk.in
@@ -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/jlibtool.c b/build/jlibtool.c
index 39520aad0..c39fc8054 100644
--- a/build/jlibtool.c
+++ b/build/jlibtool.c
@@ -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/pkg/buildpkg.sh b/build/pkg/buildpkg.sh
index 3c93263a6..96f5f1c97 100755
--- a/build/pkg/buildpkg.sh
+++ b/build/pkg/buildpkg.sh
@@ -1,5 +1,6 @@
#!/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/buildconf b/buildconf
index b16441f4a..ab5bce1cc 100755
--- a/buildconf
+++ b/buildconf
@@ -1,5 +1,6 @@
#!/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/dso/aix/dso.c b/dso/aix/dso.c
index 1b1970031..0b4736add 100644
--- a/dso/aix/dso.c
+++ b/dso/aix/dso.c
@@ -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/dso/beos/dso.c b/dso/beos/dso.c
index 41fec3450..797c11089 100644
--- a/dso/beos/dso.c
+++ b/dso/beos/dso.c
@@ -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/dso/netware/dso.c b/dso/netware/dso.c
index ba93d1d71..9bc24d72c 100644
--- a/dso/netware/dso.c
+++ b/dso/netware/dso.c
@@ -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/dso/os2/dso.c b/dso/os2/dso.c
index da9f636c0..7e735841e 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -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/dso/os390/dso.c b/dso/os390/dso.c
index 3022e0ea1..0dcac7a8e 100644
--- a/dso/os390/dso.c
+++ b/dso/os390/dso.c
@@ -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/dso/unix/dso.c b/dso/unix/dso.c
index ce9470776..739087229 100644
--- a/dso/unix/dso.c
+++ b/dso/unix/dso.c
@@ -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/dso/win32/dso.c b/dso/win32/dso.c
index bf398e46e..17651db01 100644
--- a/dso/win32/dso.c
+++ b/dso/win32/dso.c
@@ -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/file_io/netware/filestat.c b/file_io/netware/filestat.c
index 5c43bb937..1fb31d9ee 100644
--- a/file_io/netware/filestat.c
+++ b/file_io/netware/filestat.c
@@ -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/file_io/netware/filesys.c b/file_io/netware/filesys.c
index 532bee7c1..500976442 100644
--- a/file_io/netware/filesys.c
+++ b/file_io/netware/filesys.c
@@ -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/file_io/netware/flock.c b/file_io/netware/flock.c
index 7e7d771cf..bd4beb037 100644
--- a/file_io/netware/flock.c
+++ b/file_io/netware/flock.c
@@ -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/file_io/netware/mktemp.c b/file_io/netware/mktemp.c
index 58e89386b..f1568bdd6 100644
--- a/file_io/netware/mktemp.c
+++ b/file_io/netware/mktemp.c
@@ -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/file_io/netware/pipe.c b/file_io/netware/pipe.c
index 2cf03ccc8..2763bd97f 100644
--- a/file_io/netware/pipe.c
+++ b/file_io/netware/pipe.c
@@ -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/file_io/os2/dir.c b/file_io/os2/dir.c
index 0ea1d27f2..8a140248d 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -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/file_io/os2/dir_make_recurse.c b/file_io/os2/dir_make_recurse.c
index 4f2acaaab..9cde1a987 100644
--- a/file_io/os2/dir_make_recurse.c
+++ b/file_io/os2/dir_make_recurse.c
@@ -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/file_io/os2/fileacc.c b/file_io/os2/fileacc.c
index 870c5ddd8..0b0c26d24 100644
--- a/file_io/os2/fileacc.c
+++ b/file_io/os2/fileacc.c
@@ -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/file_io/os2/filedup.c b/file_io/os2/filedup.c
index 2d06acdd2..d592033a0 100644
--- a/file_io/os2/filedup.c
+++ b/file_io/os2/filedup.c
@@ -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/file_io/os2/filestat.c b/file_io/os2/filestat.c
index cafdf4f1b..0414c7150 100644
--- a/file_io/os2/filestat.c
+++ b/file_io/os2/filestat.c
@@ -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/file_io/os2/filesys.c b/file_io/os2/filesys.c
index ef597b38e..cf3b83298 100644
--- a/file_io/os2/filesys.c
+++ b/file_io/os2/filesys.c
@@ -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/file_io/os2/flock.c b/file_io/os2/flock.c
index 9e452821d..4c5e54d93 100644
--- a/file_io/os2/flock.c
+++ b/file_io/os2/flock.c
@@ -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/file_io/os2/maperrorcode.c b/file_io/os2/maperrorcode.c
index 9848a6e58..2ea84bb4d 100644
--- a/file_io/os2/maperrorcode.c
+++ b/file_io/os2/maperrorcode.c
@@ -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/file_io/os2/open.c b/file_io/os2/open.c
index fb5f74007..3ece06224 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -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/file_io/os2/pipe.c b/file_io/os2/pipe.c
index df3511223..1e1894684 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -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/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 38855b035..81f50f978 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -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/file_io/os2/seek.c b/file_io/os2/seek.c
index 98f2ea5b0..40b02a815 100644
--- a/file_io/os2/seek.c
+++ b/file_io/os2/seek.c
@@ -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/file_io/unix/copy.c b/file_io/unix/copy.c
index 55d34dd50..8ee0f590a 100644
--- a/file_io/unix/copy.c
+++ b/file_io/unix/copy.c
@@ -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/file_io/unix/dir.c b/file_io/unix/dir.c
index 29abd523c..590380f2e 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -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/file_io/unix/fileacc.c b/file_io/unix/fileacc.c
index 2f20c0bfb..542d90db8 100644
--- a/file_io/unix/fileacc.c
+++ b/file_io/unix/fileacc.c
@@ -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/file_io/unix/filedup.c b/file_io/unix/filedup.c
index f9f9f1d3e..fe792258e 100644
--- a/file_io/unix/filedup.c
+++ b/file_io/unix/filedup.c
@@ -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/file_io/unix/filepath.c b/file_io/unix/filepath.c
index dd2720e36..fd0b6a250 100644
--- a/file_io/unix/filepath.c
+++ b/file_io/unix/filepath.c
@@ -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/file_io/unix/filepath_util.c b/file_io/unix/filepath_util.c
index 40d0cd770..ec9b42609 100644
--- a/file_io/unix/filepath_util.c
+++ b/file_io/unix/filepath_util.c
@@ -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/file_io/unix/filestat.c b/file_io/unix/filestat.c
index ff16164e1..d7a48663a 100644
--- a/file_io/unix/filestat.c
+++ b/file_io/unix/filestat.c
@@ -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/file_io/unix/flock.c b/file_io/unix/flock.c
index 2ee7bc63e..9aeb4fe3e 100644
--- a/file_io/unix/flock.c
+++ b/file_io/unix/flock.c
@@ -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/file_io/unix/fullrw.c b/file_io/unix/fullrw.c
index f133b4569..c22b0c559 100644
--- a/file_io/unix/fullrw.c
+++ b/file_io/unix/fullrw.c
@@ -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/file_io/unix/mktemp.c b/file_io/unix/mktemp.c
index 6db13c69c..c516fac81 100644
--- a/file_io/unix/mktemp.c
+++ b/file_io/unix/mktemp.c
@@ -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/file_io/unix/open.c b/file_io/unix/open.c
index eab278f64..55b986302 100644
--- a/file_io/unix/open.c
+++ b/file_io/unix/open.c
@@ -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/file_io/unix/pipe.c b/file_io/unix/pipe.c
index c32613f44..ec54432f7 100644
--- a/file_io/unix/pipe.c
+++ b/file_io/unix/pipe.c
@@ -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/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 07e112273..f2514bf3b 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -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/file_io/unix/seek.c b/file_io/unix/seek.c
index 0d1152432..48368cda5 100644
--- a/file_io/unix/seek.c
+++ b/file_io/unix/seek.c
@@ -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/file_io/unix/tempdir.c b/file_io/unix/tempdir.c
index f7a7a7d42..4409cd99d 100644
--- a/file_io/unix/tempdir.c
+++ b/file_io/unix/tempdir.c
@@ -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/file_io/win32/dir.c b/file_io/win32/dir.c
index 19fe15e8c..92d896e61 100644
--- a/file_io/win32/dir.c
+++ b/file_io/win32/dir.c
@@ -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/file_io/win32/filedup.c b/file_io/win32/filedup.c
index 63aa25089..d2e3af46b 100644
--- a/file_io/win32/filedup.c
+++ b/file_io/win32/filedup.c
@@ -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/file_io/win32/filepath.c b/file_io/win32/filepath.c
index 74d6d0879..67dcd71bd 100644
--- a/file_io/win32/filepath.c
+++ b/file_io/win32/filepath.c
@@ -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/file_io/win32/filestat.c b/file_io/win32/filestat.c
index 3b8529e0a..2d688fce7 100644
--- a/file_io/win32/filestat.c
+++ b/file_io/win32/filestat.c
@@ -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/file_io/win32/filesys.c b/file_io/win32/filesys.c
index da5244baf..6d6c2bce8 100644
--- a/file_io/win32/filesys.c
+++ b/file_io/win32/filesys.c
@@ -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/file_io/win32/flock.c b/file_io/win32/flock.c
index 65a158e8c..cdbd7e174 100644
--- a/file_io/win32/flock.c
+++ b/file_io/win32/flock.c
@@ -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/file_io/win32/open.c b/file_io/win32/open.c
index 1b950fc21..21b4ba766 100644
--- a/file_io/win32/open.c
+++ b/file_io/win32/open.c
@@ -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/file_io/win32/pipe.c b/file_io/win32/pipe.c
index 297cda2be..f58b43240 100644
--- a/file_io/win32/pipe.c
+++ b/file_io/win32/pipe.c
@@ -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/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index 7a5931387..4e36f0eaf 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -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/file_io/win32/seek.c b/file_io/win32/seek.c
index b8f2bcfd4..8a2db7f4a 100644
--- a/file_io/win32/seek.c
+++ b/file_io/win32/seek.c
@@ -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/include/apr.h.in b/include/apr.h.in
index d1332921d..87869b80e 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -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/include/apr.hnw b/include/apr.hnw
index e8d14dc8b..ff444febc 100644
--- a/include/apr.hnw
+++ b/include/apr.hnw
@@ -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/include/apr.hw b/include/apr.hw
index 1174a190a..1a3c67401 100644
--- a/include/apr.hw
+++ b/include/apr.hw
@@ -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/include/apr_allocator.h b/include/apr_allocator.h
index 965612bf7..de29e911d 100644
--- a/include/apr_allocator.h
+++ b/include/apr_allocator.h
@@ -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/include/apr_atomic.h b/include/apr_atomic.h
index 784cd053c..d70106980 100644
--- a/include/apr_atomic.h
+++ b/include/apr_atomic.h
@@ -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/include/apr_dso.h b/include/apr_dso.h
index 9dd426f63..91c6d5bef 100644
--- a/include/apr_dso.h
+++ b/include/apr_dso.h
@@ -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/include/apr_env.h b/include/apr_env.h
index 200ab48f2..9e3d2a72d 100644
--- a/include/apr_env.h
+++ b/include/apr_env.h
@@ -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/include/apr_errno.h b/include/apr_errno.h
index dced627f8..2e8e63a03 100644
--- a/include/apr_errno.h
+++ b/include/apr_errno.h
@@ -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/include/apr_file_info.h b/include/apr_file_info.h
index a06c31225..4680caba2 100644
--- a/include/apr_file_info.h
+++ b/include/apr_file_info.h
@@ -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/include/apr_file_io.h b/include/apr_file_io.h
index 9a7b466c8..847ecb044 100644
--- a/include/apr_file_io.h
+++ b/include/apr_file_io.h
@@ -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/include/apr_general.h b/include/apr_general.h
index da2b34c08..5973a986e 100644
--- a/include/apr_general.h
+++ b/include/apr_general.h
@@ -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/include/apr_getopt.h b/include/apr_getopt.h
index 5d9639efb..972e14e3c 100644
--- a/include/apr_getopt.h
+++ b/include/apr_getopt.h
@@ -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/include/apr_global_mutex.h b/include/apr_global_mutex.h
index 8f9e46186..7decb2825 100644
--- a/include/apr_global_mutex.h
+++ b/include/apr_global_mutex.h
@@ -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/include/apr_hash.h b/include/apr_hash.h
index 5365c0a20..37f307c9f 100644
--- a/include/apr_hash.h
+++ b/include/apr_hash.h
@@ -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/include/apr_inherit.h b/include/apr_inherit.h
index 5dbbbae81..4042c9013 100644
--- a/include/apr_inherit.h
+++ b/include/apr_inherit.h
@@ -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/include/apr_lib.h b/include/apr_lib.h
index cb1dcedf5..c48782d5b 100644
--- a/include/apr_lib.h
+++ b/include/apr_lib.h
@@ -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/include/apr_mmap.h b/include/apr_mmap.h
index 606c0443e..f1b45e379 100644
--- a/include/apr_mmap.h
+++ b/include/apr_mmap.h
@@ -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/include/apr_network_io.h b/include/apr_network_io.h
index c7575d74f..68d8a7c49 100644
--- a/include/apr_network_io.h
+++ b/include/apr_network_io.h
@@ -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/include/apr_poll.h b/include/apr_poll.h
index bd3fd9ebb..c9c597304 100644
--- a/include/apr_poll.h
+++ b/include/apr_poll.h
@@ -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/include/apr_pools.h b/include/apr_pools.h
index cca864bf2..372319f48 100644
--- a/include/apr_pools.h
+++ b/include/apr_pools.h
@@ -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/include/apr_portable.h b/include/apr_portable.h
index 1daa1a905..b37263b78 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -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/include/apr_proc_mutex.h b/include/apr_proc_mutex.h
index cceafcf42..05c9f1965 100644
--- a/include/apr_proc_mutex.h
+++ b/include/apr_proc_mutex.h
@@ -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/include/apr_random.h b/include/apr_random.h
index fb295aa0b..b5c2baaa5 100644
--- a/include/apr_random.h
+++ b/include/apr_random.h
@@ -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/include/apr_ring.h b/include/apr_ring.h
index 5bf11aaf6..ba1ac1f7a 100644
--- a/include/apr_ring.h
+++ b/include/apr_ring.h
@@ -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/include/apr_shm.h b/include/apr_shm.h
index 88d184b0e..2acb53e34 100644
--- a/include/apr_shm.h
+++ b/include/apr_shm.h
@@ -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/include/apr_signal.h b/include/apr_signal.h
index 173044bb7..8cf65be8b 100644
--- a/include/apr_signal.h
+++ b/include/apr_signal.h
@@ -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/include/apr_strings.h b/include/apr_strings.h
index c189cb6a4..94e99c3f1 100644
--- a/include/apr_strings.h
+++ b/include/apr_strings.h
@@ -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/include/apr_support.h b/include/apr_support.h
index 164ce229d..17a146a96 100644
--- a/include/apr_support.h
+++ b/include/apr_support.h
@@ -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/include/apr_tables.h b/include/apr_tables.h
index 9cba568c7..8834caa70 100644
--- a/include/apr_tables.h
+++ b/include/apr_tables.h
@@ -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/include/apr_thread_cond.h b/include/apr_thread_cond.h
index bc6b70562..8b8a55323 100644
--- a/include/apr_thread_cond.h
+++ b/include/apr_thread_cond.h
@@ -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/include/apr_thread_mutex.h b/include/apr_thread_mutex.h
index 1040e7002..4d73164d4 100644
--- a/include/apr_thread_mutex.h
+++ b/include/apr_thread_mutex.h
@@ -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/include/apr_thread_proc.h b/include/apr_thread_proc.h
index b48620deb..edfcad10c 100644
--- a/include/apr_thread_proc.h
+++ b/include/apr_thread_proc.h
@@ -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/include/apr_thread_rwlock.h b/include/apr_thread_rwlock.h
index fdb3fa8ed..b8890b9d5 100644
--- a/include/apr_thread_rwlock.h
+++ b/include/apr_thread_rwlock.h
@@ -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/include/apr_time.h b/include/apr_time.h
index 887d90562..1882b283e 100644
--- a/include/apr_time.h
+++ b/include/apr_time.h
@@ -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/include/apr_user.h b/include/apr_user.h
index a670fde9b..2529b7913 100644
--- a/include/apr_user.h
+++ b/include/apr_user.h
@@ -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/include/apr_version.h b/include/apr_version.h
index bfa635506..c27f13d07 100644
--- a/include/apr_version.h
+++ b/include/apr_version.h
@@ -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/include/apr_want.h b/include/apr_want.h
index 23862b005..c7556a792 100644
--- a/include/apr_want.h
+++ b/include/apr_want.h
@@ -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/include/arch/aix/apr_arch_dso.h b/include/arch/aix/apr_arch_dso.h
index b59e98e23..cc9c02663 100644
--- a/include/arch/aix/apr_arch_dso.h
+++ b/include/arch/aix/apr_arch_dso.h
@@ -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/include/arch/apr_private_common.h b/include/arch/apr_private_common.h
index 912813b0d..c5fbbaa9f 100644
--- a/include/arch/apr_private_common.h
+++ b/include/arch/apr_private_common.h
@@ -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/include/arch/beos/apr_arch_dso.h b/include/arch/beos/apr_arch_dso.h
index a1ed754d3..1bf3395c0 100644
--- a/include/arch/beos/apr_arch_dso.h
+++ b/include/arch/beos/apr_arch_dso.h
@@ -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/include/arch/beos/apr_arch_proc_mutex.h b/include/arch/beos/apr_arch_proc_mutex.h
index b47076f91..1325e00ed 100644
--- a/include/arch/beos/apr_arch_proc_mutex.h
+++ b/include/arch/beos/apr_arch_proc_mutex.h
@@ -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/include/arch/beos/apr_arch_thread_cond.h b/include/arch/beos/apr_arch_thread_cond.h
index 1692edc85..b4584b47c 100644
--- a/include/arch/beos/apr_arch_thread_cond.h
+++ b/include/arch/beos/apr_arch_thread_cond.h
@@ -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/include/arch/beos/apr_arch_thread_mutex.h b/include/arch/beos/apr_arch_thread_mutex.h
index 4bd2d7e29..af9c96f87 100644
--- a/include/arch/beos/apr_arch_thread_mutex.h
+++ b/include/arch/beos/apr_arch_thread_mutex.h
@@ -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/include/arch/beos/apr_arch_thread_rwlock.h b/include/arch/beos/apr_arch_thread_rwlock.h
index 377c7b7f0..7f911816d 100644
--- a/include/arch/beos/apr_arch_thread_rwlock.h
+++ b/include/arch/beos/apr_arch_thread_rwlock.h
@@ -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/include/arch/beos/apr_arch_threadproc.h b/include/arch/beos/apr_arch_threadproc.h
index a81f69cfe..c11fe4e39 100644
--- a/include/arch/beos/apr_arch_threadproc.h
+++ b/include/arch/beos/apr_arch_threadproc.h
@@ -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/include/arch/netware/apr_arch_dso.h b/include/arch/netware/apr_arch_dso.h
index 5a4ea62fe..18d240362 100644
--- a/include/arch/netware/apr_arch_dso.h
+++ b/include/arch/netware/apr_arch_dso.h
@@ -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/include/arch/netware/apr_arch_file_io.h b/include/arch/netware/apr_arch_file_io.h
index 70ce289d9..bcef9add9 100644
--- a/include/arch/netware/apr_arch_file_io.h
+++ b/include/arch/netware/apr_arch_file_io.h
@@ -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/include/arch/netware/apr_arch_global_mutex.h b/include/arch/netware/apr_arch_global_mutex.h
index 61c910964..f8f534fef 100644
--- a/include/arch/netware/apr_arch_global_mutex.h
+++ b/include/arch/netware/apr_arch_global_mutex.h
@@ -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/include/arch/netware/apr_arch_internal_time.h b/include/arch/netware/apr_arch_internal_time.h
index 8522d37ab..399ac72e7 100644
--- a/include/arch/netware/apr_arch_internal_time.h
+++ b/include/arch/netware/apr_arch_internal_time.h
@@ -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/include/arch/netware/apr_arch_networkio.h b/include/arch/netware/apr_arch_networkio.h
index 4ec038960..0485b0b41 100644
--- a/include/arch/netware/apr_arch_networkio.h
+++ b/include/arch/netware/apr_arch_networkio.h
@@ -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/include/arch/netware/apr_arch_proc_mutex.h b/include/arch/netware/apr_arch_proc_mutex.h
index 5195a0a89..09c325e4f 100644
--- a/include/arch/netware/apr_arch_proc_mutex.h
+++ b/include/arch/netware/apr_arch_proc_mutex.h
@@ -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/include/arch/netware/apr_arch_thread_cond.h b/include/arch/netware/apr_arch_thread_cond.h
index 82607dafb..bfb5ece39 100644
--- a/include/arch/netware/apr_arch_thread_cond.h
+++ b/include/arch/netware/apr_arch_thread_cond.h
@@ -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/include/arch/netware/apr_arch_thread_mutex.h b/include/arch/netware/apr_arch_thread_mutex.h
index 794b555ba..d9b599a0e 100644
--- a/include/arch/netware/apr_arch_thread_mutex.h
+++ b/include/arch/netware/apr_arch_thread_mutex.h
@@ -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/include/arch/netware/apr_arch_thread_rwlock.h b/include/arch/netware/apr_arch_thread_rwlock.h
index 3844420d1..b87e2d5db 100644
--- a/include/arch/netware/apr_arch_thread_rwlock.h
+++ b/include/arch/netware/apr_arch_thread_rwlock.h
@@ -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/include/arch/netware/apr_arch_threadproc.h b/include/arch/netware/apr_arch_threadproc.h
index 5f5ddcff6..b30d6f6e3 100644
--- a/include/arch/netware/apr_arch_threadproc.h
+++ b/include/arch/netware/apr_arch_threadproc.h
@@ -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/include/arch/netware/apr_private.h b/include/arch/netware/apr_private.h
index 917b6fa45..3881f7379 100644
--- a/include/arch/netware/apr_private.h
+++ b/include/arch/netware/apr_private.h
@@ -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/include/arch/os2/apr_arch_dso.h b/include/arch/os2/apr_arch_dso.h
index 9b1046095..9a202a3fa 100644
--- a/include/arch/os2/apr_arch_dso.h
+++ b/include/arch/os2/apr_arch_dso.h
@@ -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/include/arch/os2/apr_arch_file_io.h b/include/arch/os2/apr_arch_file_io.h
index 014438cf7..26045c1f6 100644
--- a/include/arch/os2/apr_arch_file_io.h
+++ b/include/arch/os2/apr_arch_file_io.h
@@ -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/include/arch/os2/apr_arch_networkio.h b/include/arch/os2/apr_arch_networkio.h
index c16edfd2e..43151ed2a 100644
--- a/include/arch/os2/apr_arch_networkio.h
+++ b/include/arch/os2/apr_arch_networkio.h
@@ -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/include/arch/os2/apr_arch_os2calls.h b/include/arch/os2/apr_arch_os2calls.h
index 33a747a1d..3705ee94a 100644
--- a/include/arch/os2/apr_arch_os2calls.h
+++ b/include/arch/os2/apr_arch_os2calls.h
@@ -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/include/arch/os2/apr_arch_proc_mutex.h b/include/arch/os2/apr_arch_proc_mutex.h
index 40e35b420..737a162da 100644
--- a/include/arch/os2/apr_arch_proc_mutex.h
+++ b/include/arch/os2/apr_arch_proc_mutex.h
@@ -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/include/arch/os2/apr_arch_thread_cond.h b/include/arch/os2/apr_arch_thread_cond.h
index 85d70eccb..05d56b6e2 100644
--- a/include/arch/os2/apr_arch_thread_cond.h
+++ b/include/arch/os2/apr_arch_thread_cond.h
@@ -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/include/arch/os2/apr_arch_thread_mutex.h b/include/arch/os2/apr_arch_thread_mutex.h
index fa3f279b2..b44542943 100644
--- a/include/arch/os2/apr_arch_thread_mutex.h
+++ b/include/arch/os2/apr_arch_thread_mutex.h
@@ -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/include/arch/os2/apr_arch_thread_rwlock.h b/include/arch/os2/apr_arch_thread_rwlock.h
index e9c2c0330..b942d595e 100644
--- a/include/arch/os2/apr_arch_thread_rwlock.h
+++ b/include/arch/os2/apr_arch_thread_rwlock.h
@@ -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/include/arch/os2/apr_arch_threadproc.h b/include/arch/os2/apr_arch_threadproc.h
index 2efc4d32b..91ed2e3f9 100644
--- a/include/arch/os2/apr_arch_threadproc.h
+++ b/include/arch/os2/apr_arch_threadproc.h
@@ -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/include/arch/os390/apr_arch_dso.h b/include/arch/os390/apr_arch_dso.h
index e3084f401..2cd2112a2 100644
--- a/include/arch/os390/apr_arch_dso.h
+++ b/include/arch/os390/apr_arch_dso.h
@@ -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/include/arch/unix/apr_arch_dso.h b/include/arch/unix/apr_arch_dso.h
index 30f9f8bf9..e5d9d8305 100644
--- a/include/arch/unix/apr_arch_dso.h
+++ b/include/arch/unix/apr_arch_dso.h
@@ -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/include/arch/unix/apr_arch_file_io.h b/include/arch/unix/apr_arch_file_io.h
index 004f59ee0..1d10b0490 100644
--- a/include/arch/unix/apr_arch_file_io.h
+++ b/include/arch/unix/apr_arch_file_io.h
@@ -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/include/arch/unix/apr_arch_global_mutex.h b/include/arch/unix/apr_arch_global_mutex.h
index 24ee631d3..e5724dc7b 100644
--- a/include/arch/unix/apr_arch_global_mutex.h
+++ b/include/arch/unix/apr_arch_global_mutex.h
@@ -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/include/arch/unix/apr_arch_inherit.h b/include/arch/unix/apr_arch_inherit.h
index 0f4f59460..22914e2ef 100644
--- a/include/arch/unix/apr_arch_inherit.h
+++ b/include/arch/unix/apr_arch_inherit.h
@@ -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/include/arch/unix/apr_arch_internal_time.h b/include/arch/unix/apr_arch_internal_time.h
index 99bbb60e1..321921e9f 100644
--- a/include/arch/unix/apr_arch_internal_time.h
+++ b/include/arch/unix/apr_arch_internal_time.h
@@ -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/include/arch/unix/apr_arch_misc.h b/include/arch/unix/apr_arch_misc.h
index a7c9cfbda..4168a2b5c 100644
--- a/include/arch/unix/apr_arch_misc.h
+++ b/include/arch/unix/apr_arch_misc.h
@@ -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/include/arch/unix/apr_arch_networkio.h b/include/arch/unix/apr_arch_networkio.h
index d85cf6f4d..c55616ddb 100644
--- a/include/arch/unix/apr_arch_networkio.h
+++ b/include/arch/unix/apr_arch_networkio.h
@@ -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/include/arch/unix/apr_arch_poll_private.h b/include/arch/unix/apr_arch_poll_private.h
index f77585f7d..c653a8084 100644
--- a/include/arch/unix/apr_arch_poll_private.h
+++ b/include/arch/unix/apr_arch_poll_private.h
@@ -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/include/arch/unix/apr_arch_proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h
index 1a3a4fc01..3ed046cb1 100644
--- a/include/arch/unix/apr_arch_proc_mutex.h
+++ b/include/arch/unix/apr_arch_proc_mutex.h
@@ -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/include/arch/unix/apr_arch_shm.h b/include/arch/unix/apr_arch_shm.h
index 6443163da..b57df765f 100644
--- a/include/arch/unix/apr_arch_shm.h
+++ b/include/arch/unix/apr_arch_shm.h
@@ -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/include/arch/unix/apr_arch_thread_cond.h b/include/arch/unix/apr_arch_thread_cond.h
index 14f3b9b6a..643b01d59 100644
--- a/include/arch/unix/apr_arch_thread_cond.h
+++ b/include/arch/unix/apr_arch_thread_cond.h
@@ -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/include/arch/unix/apr_arch_thread_mutex.h b/include/arch/unix/apr_arch_thread_mutex.h
index a682b3ec9..6b1b6717b 100644
--- a/include/arch/unix/apr_arch_thread_mutex.h
+++ b/include/arch/unix/apr_arch_thread_mutex.h
@@ -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/include/arch/unix/apr_arch_thread_rwlock.h b/include/arch/unix/apr_arch_thread_rwlock.h
index a21541ee1..c4631897c 100644
--- a/include/arch/unix/apr_arch_thread_rwlock.h
+++ b/include/arch/unix/apr_arch_thread_rwlock.h
@@ -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/include/arch/unix/apr_arch_threadproc.h b/include/arch/unix/apr_arch_threadproc.h
index c789bca97..bb91ef7f7 100644
--- a/include/arch/unix/apr_arch_threadproc.h
+++ b/include/arch/unix/apr_arch_threadproc.h
@@ -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/include/arch/win32/apr_arch_atime.h b/include/arch/win32/apr_arch_atime.h
index dd4de7865..bf09a3289 100644
--- a/include/arch/win32/apr_arch_atime.h
+++ b/include/arch/win32/apr_arch_atime.h
@@ -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/include/arch/win32/apr_arch_dso.h b/include/arch/win32/apr_arch_dso.h
index 6829d7993..e26f4ecc7 100644
--- a/include/arch/win32/apr_arch_dso.h
+++ b/include/arch/win32/apr_arch_dso.h
@@ -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/include/arch/win32/apr_arch_file_io.h b/include/arch/win32/apr_arch_file_io.h
index 4e48a9416..3af8720b9 100644
--- a/include/arch/win32/apr_arch_file_io.h
+++ b/include/arch/win32/apr_arch_file_io.h
@@ -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/include/arch/win32/apr_arch_inherit.h b/include/arch/win32/apr_arch_inherit.h
index 911f35d8c..b7eb1e673 100644
--- a/include/arch/win32/apr_arch_inherit.h
+++ b/include/arch/win32/apr_arch_inherit.h
@@ -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/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h
index c63d64eb0..fc86fe22f 100644
--- a/include/arch/win32/apr_arch_misc.h
+++ b/include/arch/win32/apr_arch_misc.h
@@ -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/include/arch/win32/apr_arch_networkio.h b/include/arch/win32/apr_arch_networkio.h
index c2dd0b6e9..d07e4485a 100644
--- a/include/arch/win32/apr_arch_networkio.h
+++ b/include/arch/win32/apr_arch_networkio.h
@@ -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/include/arch/win32/apr_arch_proc_mutex.h b/include/arch/win32/apr_arch_proc_mutex.h
index 3e47b5e04..aaac5a30c 100644
--- a/include/arch/win32/apr_arch_proc_mutex.h
+++ b/include/arch/win32/apr_arch_proc_mutex.h
@@ -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/include/arch/win32/apr_arch_thread_cond.h b/include/arch/win32/apr_arch_thread_cond.h
index 98b7adf63..5520ef26b 100644
--- a/include/arch/win32/apr_arch_thread_cond.h
+++ b/include/arch/win32/apr_arch_thread_cond.h
@@ -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/include/arch/win32/apr_arch_thread_mutex.h b/include/arch/win32/apr_arch_thread_mutex.h
index c801a871b..e180b7d42 100644
--- a/include/arch/win32/apr_arch_thread_mutex.h
+++ b/include/arch/win32/apr_arch_thread_mutex.h
@@ -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/include/arch/win32/apr_arch_thread_rwlock.h b/include/arch/win32/apr_arch_thread_rwlock.h
index 57feaf115..5a41fb97d 100644
--- a/include/arch/win32/apr_arch_thread_rwlock.h
+++ b/include/arch/win32/apr_arch_thread_rwlock.h
@@ -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/include/arch/win32/apr_arch_threadproc.h b/include/arch/win32/apr_arch_threadproc.h
index ef8340ddd..3fb64a0e9 100644
--- a/include/arch/win32/apr_arch_threadproc.h
+++ b/include/arch/win32/apr_arch_threadproc.h
@@ -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/include/arch/win32/apr_arch_utf8.h b/include/arch/win32/apr_arch_utf8.h
index cff076f36..c3ca62745 100644
--- a/include/arch/win32/apr_arch_utf8.h
+++ b/include/arch/win32/apr_arch_utf8.h
@@ -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/include/arch/win32/apr_dbg_win32_handles.h b/include/arch/win32/apr_dbg_win32_handles.h
index 04f6ef314..291d77db0 100644
--- a/include/arch/win32/apr_dbg_win32_handles.h
+++ b/include/arch/win32/apr_dbg_win32_handles.h
@@ -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/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h
index 0dee29348..ac93d1ed8 100644
--- a/include/arch/win32/apr_private.h
+++ b/include/arch/win32/apr_private.h
@@ -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/locks/beos/proc_mutex.c b/locks/beos/proc_mutex.c
index 8d3ca31c2..85f4e06e9 100644
--- a/locks/beos/proc_mutex.c
+++ b/locks/beos/proc_mutex.c
@@ -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/locks/beos/thread_cond.c b/locks/beos/thread_cond.c
index 71068facb..dc9ba618c 100644
--- a/locks/beos/thread_cond.c
+++ b/locks/beos/thread_cond.c
@@ -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/locks/beos/thread_mutex.c b/locks/beos/thread_mutex.c
index 350e05b9b..5f488f16f 100644
--- a/locks/beos/thread_mutex.c
+++ b/locks/beos/thread_mutex.c
@@ -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/locks/beos/thread_rwlock.c b/locks/beos/thread_rwlock.c
index 2f8140748..be11017a2 100644
--- a/locks/beos/thread_rwlock.c
+++ b/locks/beos/thread_rwlock.c
@@ -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/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c
index f05cde6dc..72a8bfcdd 100644
--- a/locks/netware/proc_mutex.c
+++ b/locks/netware/proc_mutex.c
@@ -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/locks/netware/thread_cond.c b/locks/netware/thread_cond.c
index 3942b06f8..fdaa95873 100644
--- a/locks/netware/thread_cond.c
+++ b/locks/netware/thread_cond.c
@@ -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/locks/netware/thread_mutex.c b/locks/netware/thread_mutex.c
index b4f9c66a8..0d41b30e0 100644
--- a/locks/netware/thread_mutex.c
+++ b/locks/netware/thread_mutex.c
@@ -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/locks/netware/thread_rwlock.c b/locks/netware/thread_rwlock.c
index fdee923a0..1631012a2 100644
--- a/locks/netware/thread_rwlock.c
+++ b/locks/netware/thread_rwlock.c
@@ -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/locks/os2/proc_mutex.c b/locks/os2/proc_mutex.c
index e88e35b1e..8527e3f55 100644
--- a/locks/os2/proc_mutex.c
+++ b/locks/os2/proc_mutex.c
@@ -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/locks/os2/thread_cond.c b/locks/os2/thread_cond.c
index ce0150a21..575d91a8d 100644
--- a/locks/os2/thread_cond.c
+++ b/locks/os2/thread_cond.c
@@ -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/locks/os2/thread_mutex.c b/locks/os2/thread_mutex.c
index e7f22cbab..0b21ea4e4 100644
--- a/locks/os2/thread_mutex.c
+++ b/locks/os2/thread_mutex.c
@@ -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/locks/os2/thread_rwlock.c b/locks/os2/thread_rwlock.c
index 5938a9341..653112dab 100644
--- a/locks/os2/thread_rwlock.c
+++ b/locks/os2/thread_rwlock.c
@@ -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/locks/unix/global_mutex.c b/locks/unix/global_mutex.c
index a14673e31..9a72d1438 100644
--- a/locks/unix/global_mutex.c
+++ b/locks/unix/global_mutex.c
@@ -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/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index e7a70a44c..98fb2eb1e 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -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/locks/unix/thread_cond.c b/locks/unix/thread_cond.c
index 4eaeaf35f..c1ebb895c 100644
--- a/locks/unix/thread_cond.c
+++ b/locks/unix/thread_cond.c
@@ -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/locks/unix/thread_mutex.c b/locks/unix/thread_mutex.c
index 66de2d196..31a566f6e 100644
--- a/locks/unix/thread_mutex.c
+++ b/locks/unix/thread_mutex.c
@@ -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/locks/unix/thread_rwlock.c b/locks/unix/thread_rwlock.c
index 2a4c4731a..18f374794 100644
--- a/locks/unix/thread_rwlock.c
+++ b/locks/unix/thread_rwlock.c
@@ -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/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c
index a25059893..9e316506a 100644
--- a/locks/win32/proc_mutex.c
+++ b/locks/win32/proc_mutex.c
@@ -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/locks/win32/thread_cond.c b/locks/win32/thread_cond.c
index 218da537d..dca1e8fb6 100644
--- a/locks/win32/thread_cond.c
+++ b/locks/win32/thread_cond.c
@@ -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/locks/win32/thread_mutex.c b/locks/win32/thread_mutex.c
index 125c2c2b6..0a848fbcf 100644
--- a/locks/win32/thread_mutex.c
+++ b/locks/win32/thread_mutex.c
@@ -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/locks/win32/thread_rwlock.c b/locks/win32/thread_rwlock.c
index c4ced1ea3..75d79bcbe 100644
--- a/locks/win32/thread_rwlock.c
+++ b/locks/win32/thread_rwlock.c
@@ -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/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 9bf8fa290..d7abede33 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -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/misc/netware/charset.c b/misc/netware/charset.c
index 7250bda7f..c771abc07 100644
--- a/misc/netware/charset.c
+++ b/misc/netware/charset.c
@@ -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/misc/netware/rand.c b/misc/netware/rand.c
index e21a0ebfb..8dd89dace 100644
--- a/misc/netware/rand.c
+++ b/misc/netware/rand.c
@@ -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/misc/netware/start.c b/misc/netware/start.c
index e7ca10312..d359c3de4 100644
--- a/misc/netware/start.c
+++ b/misc/netware/start.c
@@ -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/misc/unix/charset.c b/misc/unix/charset.c
index 6acb4e157..8a4b89741 100644
--- a/misc/unix/charset.c
+++ b/misc/unix/charset.c
@@ -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/misc/unix/env.c b/misc/unix/env.c
index 25c8277aa..4b95c5d9b 100644
--- a/misc/unix/env.c
+++ b/misc/unix/env.c
@@ -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/misc/unix/errorcodes.c b/misc/unix/errorcodes.c
index 5c318d530..d814763b5 100644
--- a/misc/unix/errorcodes.c
+++ b/misc/unix/errorcodes.c
@@ -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/misc/unix/otherchild.c b/misc/unix/otherchild.c
index 17866ee81..8ae41410c 100644
--- a/misc/unix/otherchild.c
+++ b/misc/unix/otherchild.c
@@ -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/misc/unix/rand.c b/misc/unix/rand.c
index 83398b9b5..efcdf1fef 100644
--- a/misc/unix/rand.c
+++ b/misc/unix/rand.c
@@ -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/misc/unix/randbyte_os2.inc b/misc/unix/randbyte_os2.inc
index e5c9bcb45..ee23f8d90 100644
--- a/misc/unix/randbyte_os2.inc
+++ b/misc/unix/randbyte_os2.inc
@@ -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/misc/unix/start.c b/misc/unix/start.c
index 8b6905d88..c1176bdea 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -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/misc/unix/version.c b/misc/unix/version.c
index 90a2df7d7..a46cf6c2c 100644
--- a/misc/unix/version.c
+++ b/misc/unix/version.c
@@ -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/misc/win32/apr_app.c b/misc/win32/apr_app.c
index c7a4b9348..eb76df35a 100644
--- a/misc/win32/apr_app.c
+++ b/misc/win32/apr_app.c
@@ -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/misc/win32/charset.c b/misc/win32/charset.c
index 7760fc3ff..c0db77184 100644
--- a/misc/win32/charset.c
+++ b/misc/win32/charset.c
@@ -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/misc/win32/env.c b/misc/win32/env.c
index 3a3386b92..d8edc400b 100644
--- a/misc/win32/env.c
+++ b/misc/win32/env.c
@@ -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/misc/win32/internal.c b/misc/win32/internal.c
index 48398dad2..239011264 100644
--- a/misc/win32/internal.c
+++ b/misc/win32/internal.c
@@ -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/misc/win32/misc.c b/misc/win32/misc.c
index 743580944..5215285aa 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -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/misc/win32/rand.c b/misc/win32/rand.c
index ab53d0dcf..dddbbe04b 100644
--- a/misc/win32/rand.c
+++ b/misc/win32/rand.c
@@ -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/misc/win32/start.c b/misc/win32/start.c
index 7e130afd1..be43f54e3 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -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/misc/win32/utf8.c b/misc/win32/utf8.c
index f7b70cb87..d77e656d3 100644
--- a/misc/win32/utf8.c
+++ b/misc/win32/utf8.c
@@ -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/mmap/unix/common.c b/mmap/unix/common.c
index 05c753aec..b300a993d 100644
--- a/mmap/unix/common.c
+++ b/mmap/unix/common.c
@@ -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/mmap/unix/mmap.c b/mmap/unix/mmap.c
index 05d3f72ef..fdce7fa7f 100644
--- a/mmap/unix/mmap.c
+++ b/mmap/unix/mmap.c
@@ -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/mmap/win32/mmap.c b/mmap/win32/mmap.c
index 36f99245e..4db585281 100644
--- a/mmap/win32/mmap.c
+++ b/mmap/win32/mmap.c
@@ -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/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index 1ba3fcd54..6378a3aaa 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -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/network_io/os2/os2calls.c b/network_io/os2/os2calls.c
index 70d0ca5a9..ef204ca7a 100644
--- a/network_io/os2/os2calls.c
+++ b/network_io/os2/os2calls.c
@@ -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/network_io/os2/sendrecv.c b/network_io/os2/sendrecv.c
index 415c2a87d..a762b7dc3 100644
--- a/network_io/os2/sendrecv.c
+++ b/network_io/os2/sendrecv.c
@@ -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/network_io/os2/sendrecv_udp.c b/network_io/os2/sendrecv_udp.c
index 97358af79..7a79e715d 100644
--- a/network_io/os2/sendrecv_udp.c
+++ b/network_io/os2/sendrecv_udp.c
@@ -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/network_io/os2/sockets.c b/network_io/os2/sockets.c
index 4ad89e51f..aeaef0db0 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -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/network_io/os2/sockopt.c b/network_io/os2/sockopt.c
index afba0ca6f..5f8a70371 100644
--- a/network_io/os2/sockopt.c
+++ b/network_io/os2/sockopt.c
@@ -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/network_io/unix/multicast.c b/network_io/unix/multicast.c
index eb4304f07..904ee404e 100644
--- a/network_io/unix/multicast.c
+++ b/network_io/unix/multicast.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/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index c5fc43a83..46853a39b 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -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/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index 5c8b7b047..f27e97fb9 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -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/network_io/unix/sockets.c b/network_io/unix/sockets.c
index ed9616801..05ae6cce3 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -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/network_io/unix/sockopt.c b/network_io/unix/sockopt.c
index 1d069e51e..4dfa22fce 100644
--- a/network_io/unix/sockopt.c
+++ b/network_io/unix/sockopt.c
@@ -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/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c
index 11573fdad..5f5df4802 100644
--- a/network_io/win32/sendrecv.c
+++ b/network_io/win32/sendrecv.c
@@ -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/network_io/win32/sockets.c b/network_io/win32/sockets.c
index 94676b8c1..d095f4bac 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -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/network_io/win32/sockopt.c b/network_io/win32/sockopt.c
index 1a5f29ff7..73c7317ed 100644
--- a/network_io/win32/sockopt.c
+++ b/network_io/win32/sockopt.c
@@ -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/passwd/apr_getpass.c b/passwd/apr_getpass.c
index f30896139..c8dcf3e5f 100644
--- a/passwd/apr_getpass.c
+++ b/passwd/apr_getpass.c
@@ -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/poll/os2/poll.c b/poll/os2/poll.c
index a9f92b3da..7116babf5 100644
--- a/poll/os2/poll.c
+++ b/poll/os2/poll.c
@@ -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/poll/os2/pollset.c b/poll/os2/pollset.c
index f6722182b..473f2a8a9 100644
--- a/poll/os2/pollset.c
+++ b/poll/os2/pollset.c
@@ -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/poll/unix/epoll.c b/poll/unix/epoll.c
index d7f0dc43f..30b30dcd8 100644
--- a/poll/unix/epoll.c
+++ b/poll/unix/epoll.c
@@ -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/poll/unix/kqueue.c b/poll/unix/kqueue.c
index e04c132d9..287ab18fb 100644
--- a/poll/unix/kqueue.c
+++ b/poll/unix/kqueue.c
@@ -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/poll/unix/poll.c b/poll/unix/poll.c
index bb2ebc093..b212f2940 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -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/poll/unix/port.c b/poll/unix/port.c
index 72f32884f..f2350ee99 100644
--- a/poll/unix/port.c
+++ b/poll/unix/port.c
@@ -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/poll/unix/select.c b/poll/unix/select.c
index e865e6c56..e6e84b59a 100644
--- a/poll/unix/select.c
+++ b/poll/unix/select.c
@@ -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/random/unix/apr_random.c b/random/unix/apr_random.c
index 49af49079..ae80e0bf8 100644
--- a/random/unix/apr_random.c
+++ b/random/unix/apr_random.c
@@ -1,4 +1,5 @@
-/* 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/random/unix/sha2.c b/random/unix/sha2.c
index 7ce6d659b..94259ca85 100644
--- a/random/unix/sha2.c
+++ b/random/unix/sha2.c
@@ -1,4 +1,5 @@
-/* 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/random/unix/sha2.h b/random/unix/sha2.h
index df99e7652..7f5821614 100644
--- a/random/unix/sha2.h
+++ b/random/unix/sha2.h
@@ -1,4 +1,5 @@
-/* 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/shmem/beos/shm.c b/shmem/beos/shm.c
index d9a0d1399..0f70eed1c 100644
--- a/shmem/beos/shm.c
+++ b/shmem/beos/shm.c
@@ -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/shmem/os2/shm.c b/shmem/os2/shm.c
index 03f381d7a..629492338 100644
--- a/shmem/os2/shm.c
+++ b/shmem/os2/shm.c
@@ -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/shmem/unix/shm.c b/shmem/unix/shm.c
index db0dc5e79..d5b0bc6a3 100644
--- a/shmem/unix/shm.c
+++ b/shmem/unix/shm.c
@@ -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/shmem/win32/shm.c b/shmem/win32/shm.c
index 56ddae7c5..6f025718e 100644
--- a/shmem/win32/shm.c
+++ b/shmem/win32/shm.c
@@ -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/strings/apr_cpystrn.c b/strings/apr_cpystrn.c
index 37a39c51a..9edba846a 100644
--- a/strings/apr_cpystrn.c
+++ b/strings/apr_cpystrn.c
@@ -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/strings/apr_snprintf.c b/strings/apr_snprintf.c
index fa4cee3a0..a4b142308 100644
--- a/strings/apr_snprintf.c
+++ b/strings/apr_snprintf.c
@@ -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/strings/apr_strings.c b/strings/apr_strings.c
index 23531022e..973c3209c 100644
--- a/strings/apr_strings.c
+++ b/strings/apr_strings.c
@@ -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/strings/apr_strtok.c b/strings/apr_strtok.c
index e1b44a9d7..b03263346 100644
--- a/strings/apr_strtok.c
+++ b/strings/apr_strtok.c
@@ -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/support/unix/waitio.c b/support/unix/waitio.c
index dae9e3813..81fea536b 100644
--- a/support/unix/waitio.c
+++ b/support/unix/waitio.c
@@ -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/tables/apr_hash.c b/tables/apr_hash.c
index fba4ff162..5cabe4faa 100644
--- a/tables/apr_hash.c
+++ b/tables/apr_hash.c
@@ -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/tables/apr_tables.c b/tables/apr_tables.c
index 7b208691c..831a71e3c 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -1,5 +1,6 @@
#include <stdio.h>
-/* 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/test/abts_tests.h b/test/abts_tests.h
index 18ef20773..744204d0c 100644
--- a/test/abts_tests.h
+++ b/test/abts_tests.h
@@ -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/test/globalmutexchild.c b/test/globalmutexchild.c
index 6c8924f10..e26d0a809 100644
--- a/test/globalmutexchild.c
+++ b/test/globalmutexchild.c
@@ -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/test/internal/testregex.c b/test/internal/testregex.c
index 3b68a4019..0103d4482 100644
--- a/test/internal/testregex.c
+++ b/test/internal/testregex.c
@@ -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/test/internal/testucs.c b/test/internal/testucs.c
index 9212538eb..80e345450 100644
--- a/test/internal/testucs.c
+++ b/test/internal/testucs.c
@@ -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/test/mod_test.c b/test/mod_test.c
index 3b4c12f66..5184d78c1 100644
--- a/test/mod_test.c
+++ b/test/mod_test.c
@@ -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/test/readchild.c b/test/readchild.c
index 2cc274591..82ef82f66 100644
--- a/test/readchild.c
+++ b/test/readchild.c
@@ -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/test/sendfile.c b/test/sendfile.c
index 1ee1adc83..efe1b8918 100644
--- a/test/sendfile.c
+++ b/test/sendfile.c
@@ -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/test/sockchild.c b/test/sockchild.c
index 0e156327f..c81ec4a3f 100644
--- a/test/sockchild.c
+++ b/test/sockchild.c
@@ -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/test/testargs.c b/test/testargs.c
index 6c136aac4..9dc68beb5 100644
--- a/test/testargs.c
+++ b/test/testargs.c
@@ -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/test/testatomic.c b/test/testatomic.c
index 62fc4c60e..95f31119c 100644
--- a/test/testatomic.c
+++ b/test/testatomic.c
@@ -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/test/testdir.c b/test/testdir.c
index 0bb5f3b5a..bc2ca9ae6 100644
--- a/test/testdir.c
+++ b/test/testdir.c
@@ -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/test/testdso.c b/test/testdso.c
index 8f67fccd5..5187cdd25 100644
--- a/test/testdso.c
+++ b/test/testdso.c
@@ -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/test/testdup.c b/test/testdup.c
index 7f4409ea4..9e025069c 100644
--- a/test/testdup.c
+++ b/test/testdup.c
@@ -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/test/testenv.c b/test/testenv.c
index 592f59ccd..4d6f55c1c 100644
--- a/test/testenv.c
+++ b/test/testenv.c
@@ -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/test/testfile.c b/test/testfile.c
index 4d7dee62c..508ebaf9f 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -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/test/testfilecopy.c b/test/testfilecopy.c
index 21db4bcac..96b24d7ff 100644
--- a/test/testfilecopy.c
+++ b/test/testfilecopy.c
@@ -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/test/testfileinfo.c b/test/testfileinfo.c
index abb089201..de5415f11 100644
--- a/test/testfileinfo.c
+++ b/test/testfileinfo.c
@@ -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/test/testflock.c b/test/testflock.c
index dc679e2e7..61e469d37 100644
--- a/test/testflock.c
+++ b/test/testflock.c
@@ -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/test/testflock.h b/test/testflock.h
index a2020ae2f..0c1fd1852 100644
--- a/test/testflock.h
+++ b/test/testflock.h
@@ -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/test/testfmt.c b/test/testfmt.c
index 9d40a1c03..6cc2c3db4 100644
--- a/test/testfmt.c
+++ b/test/testfmt.c
@@ -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/test/testfnmatch.c b/test/testfnmatch.c
index ea7188917..3b01b0f31 100644
--- a/test/testfnmatch.c
+++ b/test/testfnmatch.c
@@ -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/test/testglobalmutex.c b/test/testglobalmutex.c
index 1a7901ab2..ccd7d7bea 100644
--- a/test/testglobalmutex.c
+++ b/test/testglobalmutex.c
@@ -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/test/testglobalmutex.h b/test/testglobalmutex.h
index a8e5b629a..87581a2de 100644
--- a/test/testglobalmutex.h
+++ b/test/testglobalmutex.h
@@ -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/test/testhash.c b/test/testhash.c
index 61e9f2615..b2e2b0ac4 100644
--- a/test/testhash.c
+++ b/test/testhash.c
@@ -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/test/testipsub.c b/test/testipsub.c
index caf1d46cc..a5743b0ae 100644
--- a/test/testipsub.c
+++ b/test/testipsub.c
@@ -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/test/testlfs.c b/test/testlfs.c
index 5f83b453b..e603968e6 100644
--- a/test/testlfs.c
+++ b/test/testlfs.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/test/testlock.c b/test/testlock.c
index 6fef9b713..8e7943dde 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -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/test/testlockperf.c b/test/testlockperf.c
index ea2da4394..c0c7236f1 100644
--- a/test/testlockperf.c
+++ b/test/testlockperf.c
@@ -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/test/testmmap.c b/test/testmmap.c
index 96de1abf3..917ab31f3 100644
--- a/test/testmmap.c
+++ b/test/testmmap.c
@@ -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/test/testmutexscope.c b/test/testmutexscope.c
index 87c135dad..087f15d1c 100644
--- a/test/testmutexscope.c
+++ b/test/testmutexscope.c
@@ -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/test/testnames.c b/test/testnames.c
index e0f7ec822..b47cd43c6 100644
--- a/test/testnames.c
+++ b/test/testnames.c
@@ -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/test/testoc.c b/test/testoc.c
index 335acab8a..b20393b37 100644
--- a/test/testoc.c
+++ b/test/testoc.c
@@ -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/test/testpath.c b/test/testpath.c
index 68fa3798c..4ada86c62 100644
--- a/test/testpath.c
+++ b/test/testpath.c
@@ -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/test/testpipe.c b/test/testpipe.c
index 5e9a339ee..402aa257e 100644
--- a/test/testpipe.c
+++ b/test/testpipe.c
@@ -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/test/testpoll.c b/test/testpoll.c
index 690884a91..ebcb8acd9 100644
--- a/test/testpoll.c
+++ b/test/testpoll.c
@@ -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/test/testpools.c b/test/testpools.c
index 5ef6a7ef3..2e81c154b 100644
--- a/test/testpools.c
+++ b/test/testpools.c
@@ -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/test/testproc.c b/test/testproc.c
index 259286f12..68aa5a211 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -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/test/testprocmutex.c b/test/testprocmutex.c
index 407a7d9f7..0b7b1310e 100644
--- a/test/testprocmutex.c
+++ b/test/testprocmutex.c
@@ -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/test/testrand.c b/test/testrand.c
index ceb127f14..ca94b60b9 100644
--- a/test/testrand.c
+++ b/test/testrand.c
@@ -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/test/testrand2.c b/test/testrand2.c
index 8d5b7b07c..6dd7b5d6c 100644
--- a/test/testrand2.c
+++ b/test/testrand2.c
@@ -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/test/testshm.c b/test/testshm.c
index 189f62440..7329aa6de 100644
--- a/test/testshm.c
+++ b/test/testshm.c
@@ -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/test/testshm.h b/test/testshm.h
index bb12f7c42..e61b315be 100644
--- a/test/testshm.h
+++ b/test/testshm.h
@@ -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/test/testshmconsumer.c b/test/testshmconsumer.c
index 14db1f5e7..bede62fe8 100644
--- a/test/testshmconsumer.c
+++ b/test/testshmconsumer.c
@@ -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/test/testshmproducer.c b/test/testshmproducer.c
index 93cb5b5ca..dbab1298f 100644
--- a/test/testshmproducer.c
+++ b/test/testshmproducer.c
@@ -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/test/testsleep.c b/test/testsleep.c
index d933cdf73..38a3b354d 100644
--- a/test/testsleep.c
+++ b/test/testsleep.c
@@ -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/test/testsock.c b/test/testsock.c
index e541da2ed..e6c8280ca 100644
--- a/test/testsock.c
+++ b/test/testsock.c
@@ -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/test/testsock.h b/test/testsock.h
index bf52178e8..243cbf9ee 100644
--- a/test/testsock.h
+++ b/test/testsock.h
@@ -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/test/testsockets.c b/test/testsockets.c
index d6ed4bb5a..69fdf1e5b 100644
--- a/test/testsockets.c
+++ b/test/testsockets.c
@@ -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/test/testsockopt.c b/test/testsockopt.c
index 1a97c1454..28d4fe31d 100644
--- a/test/testsockopt.c
+++ b/test/testsockopt.c
@@ -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/test/teststr.c b/test/teststr.c
index 99aa8af41..490d5e184 100644
--- a/test/teststr.c
+++ b/test/teststr.c
@@ -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/test/teststrnatcmp.c b/test/teststrnatcmp.c
index bd25cb313..c0b92d619 100644
--- a/test/teststrnatcmp.c
+++ b/test/teststrnatcmp.c
@@ -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/test/testtable.c b/test/testtable.c
index 82a0120c2..8803a7173 100644
--- a/test/testtable.c
+++ b/test/testtable.c
@@ -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/test/testtemp.c b/test/testtemp.c
index 03bcfb436..bff48d253 100644
--- a/test/testtemp.c
+++ b/test/testtemp.c
@@ -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/test/testthread.c b/test/testthread.c
index 8a49e82cd..44ed57b28 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -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/test/testtime.c b/test/testtime.c
index 9803ebdfd..4ba09e2dc 100644
--- a/test/testtime.c
+++ b/test/testtime.c
@@ -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/test/testud.c b/test/testud.c
index 8c66d023a..ef9a61b32 100644
--- a/test/testud.c
+++ b/test/testud.c
@@ -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/test/testuser.c b/test/testuser.c
index b3ca3e16f..a2ccb887e 100644
--- a/test/testuser.c
+++ b/test/testuser.c
@@ -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/test/testutil.c b/test/testutil.c
index 51f0326b6..44c0b6b58 100644
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -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/test/testutil.h b/test/testutil.h
index 3e6118db6..76dd8d912 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -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/test/testvsn.c b/test/testvsn.c
index 32c0bd5b3..1840b7ac5 100644
--- a/test/testvsn.c
+++ b/test/testvsn.c
@@ -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/test/tryread.c b/test/tryread.c
index 845588068..26274ca5e 100644
--- a/test/tryread.c
+++ b/test/tryread.c
@@ -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/threadproc/beos/apr_proc_stub.c b/threadproc/beos/apr_proc_stub.c
index dce3add73..0c069f7ec 100644
--- a/threadproc/beos/apr_proc_stub.c
+++ b/threadproc/beos/apr_proc_stub.c
@@ -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/threadproc/beos/proc.c b/threadproc/beos/proc.c
index 9f1dd4cbb..1bde8e3c9 100644
--- a/threadproc/beos/proc.c
+++ b/threadproc/beos/proc.c
@@ -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/threadproc/beos/thread.c b/threadproc/beos/thread.c
index 7c63bf7af..68cbdf1d8 100644
--- a/threadproc/beos/thread.c
+++ b/threadproc/beos/thread.c
@@ -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/threadproc/beos/threadpriv.c b/threadproc/beos/threadpriv.c
index 5f1077762..15dcd3a07 100644
--- a/threadproc/beos/threadpriv.c
+++ b/threadproc/beos/threadpriv.c
@@ -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/threadproc/beos/threadproc_common.c b/threadproc/beos/threadproc_common.c
index 04ea270de..96c6e8a4e 100644
--- a/threadproc/beos/threadproc_common.c
+++ b/threadproc/beos/threadproc_common.c
@@ -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/threadproc/netware/proc.c b/threadproc/netware/proc.c
index e72234f74..2622ba895 100644
--- a/threadproc/netware/proc.c
+++ b/threadproc/netware/proc.c
@@ -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/threadproc/netware/procsup.c b/threadproc/netware/procsup.c
index 6bd4c9183..008dcaae0 100644
--- a/threadproc/netware/procsup.c
+++ b/threadproc/netware/procsup.c
@@ -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/threadproc/netware/signals.c b/threadproc/netware/signals.c
index 1ac51c70a..c2903251b 100644
--- a/threadproc/netware/signals.c
+++ b/threadproc/netware/signals.c
@@ -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/threadproc/netware/thread.c b/threadproc/netware/thread.c
index 466d99115..35ae8c88c 100644
--- a/threadproc/netware/thread.c
+++ b/threadproc/netware/thread.c
@@ -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/threadproc/netware/threadpriv.c b/threadproc/netware/threadpriv.c
index 7f7297dd1..2e99e522f 100644
--- a/threadproc/netware/threadpriv.c
+++ b/threadproc/netware/threadpriv.c
@@ -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/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 7fa9dc7c2..3ea770d0a 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -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/threadproc/os2/thread.c b/threadproc/os2/thread.c
index 582ad78a2..8235bff8a 100644
--- a/threadproc/os2/thread.c
+++ b/threadproc/os2/thread.c
@@ -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/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c
index 4e5de4480..041ff182f 100644
--- a/threadproc/os2/threadpriv.c
+++ b/threadproc/os2/threadpriv.c
@@ -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/threadproc/unix/proc.c b/threadproc/unix/proc.c
index cf7576247..ce32b09bf 100644
--- a/threadproc/unix/proc.c
+++ b/threadproc/unix/proc.c
@@ -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/threadproc/unix/procsup.c b/threadproc/unix/procsup.c
index a787f5308..5165a8f9e 100644
--- a/threadproc/unix/procsup.c
+++ b/threadproc/unix/procsup.c
@@ -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/threadproc/unix/thread.c b/threadproc/unix/thread.c
index ef0aa21b9..c32869c60 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -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/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c
index 5fbc450a6..77088a1b4 100644
--- a/threadproc/unix/threadpriv.c
+++ b/threadproc/unix/threadpriv.c
@@ -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/threadproc/win32/proc.c b/threadproc/win32/proc.c
index 7ff680f8c..df75b836b 100644
--- a/threadproc/win32/proc.c
+++ b/threadproc/win32/proc.c
@@ -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/threadproc/win32/signals.c b/threadproc/win32/signals.c
index 12d865edb..d4d8a6402 100644
--- a/threadproc/win32/signals.c
+++ b/threadproc/win32/signals.c
@@ -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/threadproc/win32/thread.c b/threadproc/win32/thread.c
index 95132cb4b..33e9afcde 100644
--- a/threadproc/win32/thread.c
+++ b/threadproc/win32/thread.c
@@ -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/threadproc/win32/threadpriv.c b/threadproc/win32/threadpriv.c
index 17687169d..0d45b0da2 100644
--- a/threadproc/win32/threadpriv.c
+++ b/threadproc/win32/threadpriv.c
@@ -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/time/win32/access.c b/time/win32/access.c
index 99e749b23..e746fca1f 100644
--- a/time/win32/access.c
+++ b/time/win32/access.c
@@ -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/time/win32/time.c b/time/win32/time.c
index 35743b3d2..89d6d5e40 100644
--- a/time/win32/time.c
+++ b/time/win32/time.c
@@ -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/time/win32/timestr.c b/time/win32/timestr.c
index f556054f3..9a288ab22 100644
--- a/time/win32/timestr.c
+++ b/time/win32/timestr.c
@@ -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/user/netware/groupinfo.c b/user/netware/groupinfo.c
index ad1914796..5e247474f 100644
--- a/user/netware/groupinfo.c
+++ b/user/netware/groupinfo.c
@@ -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/user/netware/userinfo.c b/user/netware/userinfo.c
index a5cdf3f77..a960406b4 100644
--- a/user/netware/userinfo.c
+++ b/user/netware/userinfo.c
@@ -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/user/unix/groupinfo.c b/user/unix/groupinfo.c
index 18d13b1ef..91ef4df0d 100644
--- a/user/unix/groupinfo.c
+++ b/user/unix/groupinfo.c
@@ -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/user/unix/userinfo.c b/user/unix/userinfo.c
index dfd34c528..a15b22184 100644
--- a/user/unix/userinfo.c
+++ b/user/unix/userinfo.c
@@ -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/user/win32/groupinfo.c b/user/win32/groupinfo.c
index f12102b16..622b9aa1c 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -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/user/win32/userinfo.c b/user/win32/userinfo.c
index caf676b93..6bee0055a 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -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.