summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2005-02-04 20:36:31 +0000
committerjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2005-02-04 20:36:31 +0000
commitac575244db348f46b69be72a1534bc5ae0c66dd5 (patch)
tree763f60f64faaabe4dbd3ecadbde56ce3ddc4ed7d
parent7c9f9f0c75f59acb913099b07552973d25d4b46f (diff)
downloadlibapr-ac575244db348f46b69be72a1534bc5ae0c66dd5.tar.gz
Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@151409 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--apr-config.in7
-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--build/aplibtool.c3
-rw-r--r--build/apr_rules.mk.in7
-rwxr-xr-xbuild/pkg/buildpkg.sh7
-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/fileacc.c3
-rw-r--r--file_io/os2/filedup.c3
-rw-r--r--file_io/os2/filepath.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_allocator.h3
-rw-r--r--include/apr_atomic.h3
-rw-r--r--include/apr_compat.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_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_pre_nw.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_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/libprews.c3
-rw-r--r--misc/netware/rand.c3
-rw-r--r--misc/netware/start.c3
-rw-r--r--misc/os2/randbyte.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/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/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/poll.c3
-rw-r--r--poll/unix/pollacc.c3
-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/aprtest.h3
-rw-r--r--test/client.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/server.c3
-rw-r--r--test/test_apr.h3
-rw-r--r--test/testall.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/testfileinfo.c3
-rw-r--r--test/testflock.c3
-rw-r--r--test/testfmt.c3
-rw-r--r--test/testglobalmutex.c3
-rw-r--r--test/testhash.c3
-rw-r--r--test/testipsub.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/testshm.c3
-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/testsockets.c3
-rw-r--r--test/testsockopt.c3
-rw-r--r--test/teststr.c3
-rw-r--r--test/testtable.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/testvsn.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/signals.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/unix/time.c3
-rw-r--r--time/unix/timestr.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
304 files changed, 614 insertions, 310 deletions
diff --git a/apr-config.in b/apr-config.in
index 230ad40cb..d44017653 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -1,11 +1,12 @@
#!/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.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/atomic/netware/apr_atomic.c b/atomic/netware/apr_atomic.c
index 466ebb0d1..9e505bc71 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 e192cf45c..d8e36513f 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 9732a0f99..749445d55 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/build/aplibtool.c b/build/aplibtool.c
index 30181b81c..ed0ecb195 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 da3532490..4111df0ef 100644
--- a/build/apr_rules.mk.in
+++ b/build/apr_rules.mk.in
@@ -1,10 +1,11 @@
-# Copyright 2000-2004 The Apache Software Foundation
-#
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/build/pkg/buildpkg.sh b/build/pkg/buildpkg.sh
index 3c93263a6..273c664aa 100755
--- a/build/pkg/buildpkg.sh
+++ b/build/pkg/buildpkg.sh
@@ -1,11 +1,12 @@
#!/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.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
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 a0fc5c8f3..e0eab5448 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 2581149fb..7e1f53dfe 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 a9472cf48..c53237ce7 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 eaf5196a6..21957f354 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 eb73dd99d..2e930e5a2 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/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 bcc61b3e3..df1da3b82 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/filepath.c b/file_io/os2/filepath.c
index f4f84f76b..827a6551d 100644
--- a/file_io/os2/filepath.c
+++ b/file_io/os2/filepath.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/file_io/os2/filestat.c b/file_io/os2/filestat.c
index f3d39a137..0899dd229 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 bf541c6ab..1c0f0622e 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 a9452611c..2e30eba47 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 11dd76f68..86bd43761 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 3ba64f1ba..48e97a6c3 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 2097e7339..07d55de49 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 af7b70e38..8c2aaaf8d 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 ff23a2f7b..f5af85411 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 f28f13b2a..e2ea32ea1 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 cc9f9dfd9..7df01790f 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 1e6a6e665..5e163ec7a 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 d7dfbda31..97b31b95c 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 8f0594d2c..eb835e5f2 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 ab2d08047..c794a589e 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 851e9c8c7..9d41a602f 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 ff412b74f..601a6c64d 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 9389d4fe4..64cd60b3b 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 c2ee1f14d..43794598b 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 acd249985..4fd3a7187 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 b8a5e4be8..ea7dd4534 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 3ba03542f..a278cbd8b 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_allocator.h b/include/apr_allocator.h
index 3ad7bbb2a..973b99f15 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 a21c4738e..9f22da493 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_compat.h b/include/apr_compat.h
index 472007274..497e8cd7c 100644
--- a/include/apr_compat.h
+++ b/include/apr_compat.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 236ec467c..2c4495186 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 2edb264a5..884a60c8a 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 ac80db62d..6c5b6b8d6 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 ebb37993e..823c9462b 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 4b3dfb83f..295a44220 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 282f60e95..41ec30f4b 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 27db8d46a..bb61daef9 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 fee3379d2..c2300c85b 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 9f0ad8f9a..f97c9ce46 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 546985048..584be1ad6 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 1b2ad8aec..d9ceb330a 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_ring.h b/include/apr_ring.h
index fec8710cb..36a464289 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 3507d8450..f6d63e2bc 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 2973ea048..a0788e015 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 9cdec4815..665d37ab7 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 777d517e6..3e4045dd2 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 d4d451931..83c4fcf30 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 1314ac556..81385f168 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 8faeea983..3b05a45c5 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 ccb916b25..41639bbf4 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 175fafc3e..307e787f6 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 8f1cdf831..afdca7622 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 a379f24ef..859fc7a1f 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 b2a02a8e4..b4c018664 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 6f1f01cd2..7397b5ead 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 cff48279d..4466738d0 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_pre_nw.h b/include/arch/netware/apr_arch_pre_nw.h
index 49ceb86bb..6c0026c6b 100644
--- a/include/arch/netware/apr_arch_pre_nw.h
+++ b/include/arch/netware/apr_arch_pre_nw.h
@@ -11,7 +11,8 @@
#define N_PLAT_NLM
-/* 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/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 39b79aeb1..f6bb8526b 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 89bbe5351..a4c1c7847 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 a7618ca1f..57eaf4f28 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 e3e0a83c1..78fef1915 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 2a1667876..e3ec97ec7 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 72e00fca5..5f60d1a79 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 ed5430c67..2a158f3b5 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 c8a26c9a8..3255f1e07 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_proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h
index 4c7cd4e31..47fa9fcf8 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 f1cf750eb..1fedcaa12 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 c6ab3df7e..58e524617 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 7981c3007..14c77d287 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 e47b7f8be..47e8882ab 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 7144bb9c2..dc2e40dda 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 171d8f7ca..2d6fd5583 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 1186a83b2..132c07379 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 f752fd7df..976f1ff43 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 700d853ce..196b58918 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 abb47f462..d328a9a59 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 3efc91430..7683886d1 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 38e0dfd07..03e459291 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 df12cbaae..a5f6aea1c 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 b8b9ceacc..4ba387c8b 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 2fea8aa01..1a772357a 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 7c418fc93..19c4c0415 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 b6e55d83f..dffa0a561 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 c94961f36..d669d93f2 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/libprews.c b/misc/netware/libprews.c
index 01467aab0..6395adee4 100644
--- a/misc/netware/libprews.c
+++ b/misc/netware/libprews.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/misc/netware/rand.c b/misc/netware/rand.c
index 1cf66a12a..2126d8c12 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 8b6976927..8d07a7ca6 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/os2/randbyte.c b/misc/os2/randbyte.c
index e5c9bcb45..ee23f8d90 100644
--- a/misc/os2/randbyte.c
+++ b/misc/os2/randbyte.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 5e1842fac..bfd703efb 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 46d7f8ab1..0f1f80637 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 e9e1a0c7e..6786118db 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 63891403f..467b69b22 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/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 f86746214..2706de3f2 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 62a8140c8..667874875 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 b7b6b4b2c..acd95e178 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 eb71f5698..65dd7d233 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 1921a3c74..82fea38cf 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 6081b1d2d..9ee297e0c 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 edef78c38..f83084985 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 da622c0fe..4db6ec737 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 f1cdab755..20f4524a7 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/sendrecv.c b/network_io/unix/sendrecv.c
index 8cb930f82..40f04c904 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 737d8d567..d1aaf4360 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 20e9bfed1..17d02ca34 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 dba0b78ca..458097390 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 23ecea6b6..27a4dafa2 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 464db5ac8..0b84a8dc7 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 66e2e2e1b..ada5bc184 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 0da9ca426..84942488d 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 4c054c496..494537598 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/poll.c b/poll/unix/poll.c
index 1c89d42fd..c223b10ab 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/pollacc.c b/poll/unix/pollacc.c
index 71d6f8b51..39aab740e 100644
--- a/poll/unix/pollacc.c
+++ b/poll/unix/pollacc.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/beos/shm.c b/shmem/beos/shm.c
index 58b1f0d87..0b199e057 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 149a8737b..93425dc92 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 655fca989..055bee562 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 dc6d80e73..b68c80c20 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 9000fe36c..c57a0ec04 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 8d85f50b5..3fa16751e 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 384a8c035..b066d3807 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 a748a208a..912ad5bc7 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 16cc762e3..a8b9de851 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/aprtest.h b/test/aprtest.h
index 941ae3cfe..1e91d89f8 100644
--- a/test/aprtest.h
+++ b/test/aprtest.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/client.c b/test/client.c
index b1ac05bc6..fdf3bb17a 100644
--- a/test/client.c
+++ b/test/client.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 b73266e5b..cdf041d22 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/server.c b/test/server.c
index c5d11708d..5273613f9 100644
--- a/test/server.c
+++ b/test/server.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/test_apr.h b/test/test_apr.h
index a5d98ca01..acbd045d7 100644
--- a/test/test_apr.h
+++ b/test/test_apr.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/testall.c b/test/testall.c
index 70e626b2e..97d1102f6 100644
--- a/test/testall.c
+++ b/test/testall.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 a3dc4416f..3f6575bc9 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 c6764fdd7..bb6252b3a 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 09c418022..1e2227473 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 23e79f301..5753a6773 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 166164f54..2e0d0e7e0 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 07a2d59c8..dda78d41e 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 ce02faf7b..7b097351e 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/testfileinfo.c b/test/testfileinfo.c
index af2bdc8e4..28579a4b0 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 35e94794d..7b6400ff3 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/testfmt.c b/test/testfmt.c
index dbfd1cb3d..637dc7863 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/testglobalmutex.c b/test/testglobalmutex.c
index 9eba4073f..5d77974ac 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/testhash.c b/test/testhash.c
index 078b76ac7..19f82af5e 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 63d56783e..513acd71b 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/testlock.c b/test/testlock.c
index fe14c3b03..3ede9c7e5 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 1ebaa552d..05ca381b8 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 60e74c73d..96782fb72 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 e2166a8eb..9b84586f1 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 5a13d174c..4c16f8018 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 5dd81ef80..fb98672ef 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 b78121ddf..8c6f96fa0 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 15682af98..9f19ceb35 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 f77670653..be5e5b696 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 b000526fd..1f611245e 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 4caa10d1e..ce9b587e9 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 0c5dfc61c..aa0ead774 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/testshm.c b/test/testshm.c
index 7268e88ba..5245408ef 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/testshmconsumer.c b/test/testshmconsumer.c
index 3aaa5f2ea..cff8a8386 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 83b086148..ba83d8a95 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 cd0dab199..8e81465a1 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 6506f0467..b360f2b75 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/testsockets.c b/test/testsockets.c
index 74e6d007a..ef1ba47d4 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 43d22c1c0..e0a880fd9 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 c1049449c..e3328c97b 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/testtable.c b/test/testtable.c
index ea2dec652..888d992aa 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/testthread.c b/test/testthread.c
index 8d29b95d7..372b50918 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 a84da164c..c8fca097c 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 0f8737bec..468e4f288 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 af67d10b0..aef8083a3 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/testvsn.c b/test/testvsn.c
index 2e44ffe70..02aeecc96 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/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 d733de138..e66336cc5 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 28c0a14e9..46eeef563 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 2956017e8..2f7631e79 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 ed4a5c1f2..ade595c25 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 1703b55b1..23355e165 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 abcacbb57..b8bc420f8 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 16a179cf2..63c62868f 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 19b8e1fe6..324cee053 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/signals.c b/threadproc/unix/signals.c
index 3f0fe02d3..dcea8aa71 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/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/unix/thread.c b/threadproc/unix/thread.c
index 4df4a9f1c..90d3a60fb 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 bf1f3a0b0..ca2648cd8 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 a62fb48d8..be8a3cf08 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 16925e2df..51d5f67c1 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/unix/time.c b/time/unix/time.c
index 38d3f7673..ff2becf36 100644
--- a/time/unix/time.c
+++ b/time/unix/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/unix/timestr.c b/time/unix/timestr.c
index b7a90164e..28c0909a0 100644
--- a/time/unix/timestr.c
+++ b/time/unix/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/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 23e0e6958..014b24ab5 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 2fe1ba5ee..902ab0d3f 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 0daf59fe2..151142a85 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 fe0f4a02b..cf82f81bc 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 306fa780a..2df45aced 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 3e26821c3..a9e33abe7 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 34ba4c5ed..fd679bc88 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.