summaryrefslogtreecommitdiff
path: root/srclib/apr/include
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:08 +0100
committerStefan Fritsch <sf@sfritsch.de>2011-12-27 19:42:08 +0100
commit80ba9f34b69a273d82f2f46d7fe231e30e127028 (patch)
tree7b43a6f17b53cb4ad4f9aea2503ef590b30bff50 /srclib/apr/include
parent80db94fff6a9620fb469ee911347ed973e3f7735 (diff)
downloadapache2-80ba9f34b69a273d82f2f46d7fe231e30e127028.tar.gz
Upstream tarball 2.2.4upstream/2.2.4
Diffstat (limited to 'srclib/apr/include')
-rw-r--r--srclib/apr/include/apr.h.in12
-rw-r--r--srclib/apr/include/apr.hnw12
-rw-r--r--srclib/apr/include/apr.hw21
-rw-r--r--srclib/apr/include/apr_allocator.h12
-rw-r--r--srclib/apr/include/apr_atomic.h12
-rw-r--r--srclib/apr/include/apr_dso.h12
-rw-r--r--srclib/apr/include/apr_env.h12
-rw-r--r--srclib/apr/include/apr_errno.h12
-rw-r--r--srclib/apr/include/apr_file_info.h12
-rw-r--r--srclib/apr/include/apr_file_io.h18
-rw-r--r--srclib/apr/include/apr_general.h12
-rw-r--r--srclib/apr/include/apr_getopt.h12
-rw-r--r--srclib/apr/include/apr_global_mutex.h12
-rw-r--r--srclib/apr/include/apr_hash.h12
-rw-r--r--srclib/apr/include/apr_inherit.h12
-rw-r--r--srclib/apr/include/apr_lib.h12
-rw-r--r--srclib/apr/include/apr_mmap.h12
-rw-r--r--srclib/apr/include/apr_network_io.h12
-rw-r--r--srclib/apr/include/apr_poll.h12
-rw-r--r--srclib/apr/include/apr_pools.h12
-rw-r--r--srclib/apr/include/apr_portable.h12
-rw-r--r--srclib/apr/include/apr_proc_mutex.h12
-rw-r--r--srclib/apr/include/apr_random.h12
-rw-r--r--srclib/apr/include/apr_ring.h12
-rw-r--r--srclib/apr/include/apr_shm.h12
-rw-r--r--srclib/apr/include/apr_signal.h12
-rw-r--r--srclib/apr/include/apr_strings.h20
-rw-r--r--srclib/apr/include/apr_support.h12
-rw-r--r--srclib/apr/include/apr_tables.h12
-rw-r--r--srclib/apr/include/apr_thread_cond.h12
-rw-r--r--srclib/apr/include/apr_thread_mutex.h12
-rw-r--r--srclib/apr/include/apr_thread_proc.h12
-rw-r--r--srclib/apr/include/apr_thread_rwlock.h12
-rw-r--r--srclib/apr/include/apr_time.h12
-rw-r--r--srclib/apr/include/apr_user.h12
-rw-r--r--srclib/apr/include/apr_version.h16
-rw-r--r--srclib/apr/include/apr_want.h12
-rw-r--r--srclib/apr/include/arch/aix/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/apr_private_common.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_proc_mutex.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_thread_cond.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_thread_mutex.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h12
-rw-r--r--srclib/apr/include/arch/beos/apr_arch_threadproc.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_file_io.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_global_mutex.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_internal_time.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_networkio.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_pre_nw.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_proc_mutex.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_thread_cond.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_thread_mutex.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_arch_threadproc.h12
-rw-r--r--srclib/apr/include/arch/netware/apr_private.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_file_io.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_networkio.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_os2calls.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_proc_mutex.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_thread_cond.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_thread_mutex.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h12
-rw-r--r--srclib/apr/include/arch/os2/apr_arch_threadproc.h12
-rw-r--r--srclib/apr/include/arch/os390/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_file_io.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_global_mutex.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_inherit.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_internal_time.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_misc.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_networkio.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_poll_private.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_proc_mutex.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_shm.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_thread_cond.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_thread_mutex.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h12
-rw-r--r--srclib/apr/include/arch/unix/apr_arch_threadproc.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_atime.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_dso.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_file_io.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_inherit.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_misc.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_networkio.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_proc_mutex.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_thread_cond.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_thread_mutex.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_threadproc.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_arch_utf8.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_dbg_win32_handles.h12
-rw-r--r--srclib/apr/include/arch/win32/apr_private.h12
95 files changed, 585 insertions, 582 deletions
diff --git a/srclib/apr/include/apr.h.in b/srclib/apr/include/apr.h.in
index 87869b80..04b0d2d2 100644
--- a/srclib/apr/include/apr.h.in
+++ b/srclib/apr/include/apr.h.in
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr.hnw b/srclib/apr/include/apr.hnw
index a907a878..6f1e1559 100644
--- a/srclib/apr/include/apr.hnw
+++ b/srclib/apr/include/apr.hnw
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr.hw b/srclib/apr/include/apr.hw
index 0fd7bc99..aa47ec03 100644
--- a/srclib/apr/include/apr.hw
+++ b/srclib/apr/include/apr.hw
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -60,7 +60,9 @@
* and the POSIX string handling API
*/
#if defined(_MSC_VER) && _MSC_VER >= 1400
+#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
+#endif
#pragma warning(disable: 4996)
#endif
@@ -512,13 +514,6 @@ struct iovec {
*/
#if defined(_MSC_VER) && _MSC_VER >= 1200
#pragma warning(pop)
-#endif
-
-/* Ignore Microsoft's interpretation of secure development
- * and their opinion of the POSIX standard string handling API
- */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#define _CRT_SECURE_NO_DEPRECATE
#pragma warning(disable: 4996)
#endif
diff --git a/srclib/apr/include/apr_allocator.h b/srclib/apr/include/apr_allocator.h
index de29e911..5aaeb1b2 100644
--- a/srclib/apr/include/apr_allocator.h
+++ b/srclib/apr/include/apr_allocator.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_atomic.h b/srclib/apr/include/apr_atomic.h
index d7010698..b169ff3d 100644
--- a/srclib/apr/include/apr_atomic.h
+++ b/srclib/apr/include/apr_atomic.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_dso.h b/srclib/apr/include/apr_dso.h
index 91c6d5be..ac701cfd 100644
--- a/srclib/apr/include/apr_dso.h
+++ b/srclib/apr/include/apr_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_env.h b/srclib/apr/include/apr_env.h
index 9e3d2a72..05419c37 100644
--- a/srclib/apr/include/apr_env.h
+++ b/srclib/apr/include/apr_env.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_errno.h b/srclib/apr/include/apr_errno.h
index 9f4e569e..c74e44df 100644
--- a/srclib/apr/include/apr_errno.h
+++ b/srclib/apr/include/apr_errno.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_file_info.h b/srclib/apr/include/apr_file_info.h
index bb417041..94146f0a 100644
--- a/srclib/apr/include/apr_file_info.h
+++ b/srclib/apr/include/apr_file_info.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_file_io.h b/srclib/apr/include/apr_file_io.h
index 847ecb04..b8146eea 100644
--- a/srclib/apr/include/apr_file_io.h
+++ b/srclib/apr/include/apr_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -213,6 +213,9 @@ typedef struct apr_file_t apr_file_t;
* @param pool The pool to use.
* @remark If perm is APR_OS_DEFAULT and the file is being created,
* appropriate default permissions will be used.
+ * @remark By default, the returned file descriptor will not be
+ * inherited by child processes created by apr_proc_create(). This
+ * can be changed using apr_file_inherit_set().
*/
APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **newf, const char *fname,
apr_int32_t flag, apr_fileperms_t perm,
@@ -552,6 +555,9 @@ APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile,
* @param in The file descriptor to use as input to the pipe.
* @param out The file descriptor to use as output from the pipe.
* @param pool The pool to operate on.
+ * @remark By default, the returned file descriptors will be inherited
+ * by child processes created using apr_proc_create(). This can be
+ * changed using apr_file_inherit_unset().
*/
APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
apr_file_t **out,
diff --git a/srclib/apr/include/apr_general.h b/srclib/apr/include/apr_general.h
index 5973a986..db1f25bc 100644
--- a/srclib/apr/include/apr_general.h
+++ b/srclib/apr/include/apr_general.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_getopt.h b/srclib/apr/include/apr_getopt.h
index 972e14e3..131aa4b3 100644
--- a/srclib/apr/include/apr_getopt.h
+++ b/srclib/apr/include/apr_getopt.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_global_mutex.h b/srclib/apr/include/apr_global_mutex.h
index 7decb282..9316001c 100644
--- a/srclib/apr/include/apr_global_mutex.h
+++ b/srclib/apr/include/apr_global_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_hash.h b/srclib/apr/include/apr_hash.h
index bfbd5997..454a4e9c 100644
--- a/srclib/apr/include/apr_hash.h
+++ b/srclib/apr/include/apr_hash.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_inherit.h b/srclib/apr/include/apr_inherit.h
index 4042c901..b7f7480f 100644
--- a/srclib/apr/include/apr_inherit.h
+++ b/srclib/apr/include/apr_inherit.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_lib.h b/srclib/apr/include/apr_lib.h
index 738df7a2..ed25d869 100644
--- a/srclib/apr/include/apr_lib.h
+++ b/srclib/apr/include/apr_lib.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_mmap.h b/srclib/apr/include/apr_mmap.h
index f1b45e37..77d697f5 100644
--- a/srclib/apr/include/apr_mmap.h
+++ b/srclib/apr/include/apr_mmap.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_network_io.h b/srclib/apr/include/apr_network_io.h
index 948e1df7..24708c55 100644
--- a/srclib/apr/include/apr_network_io.h
+++ b/srclib/apr/include/apr_network_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_poll.h b/srclib/apr/include/apr_poll.h
index d708600b..c5266495 100644
--- a/srclib/apr/include/apr_poll.h
+++ b/srclib/apr/include/apr_poll.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_pools.h b/srclib/apr/include/apr_pools.h
index 52880b6d..12b843e1 100644
--- a/srclib/apr/include/apr_pools.h
+++ b/srclib/apr/include/apr_pools.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_portable.h b/srclib/apr/include/apr_portable.h
index b37263b7..b1b21e37 100644
--- a/srclib/apr/include/apr_portable.h
+++ b/srclib/apr/include/apr_portable.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_proc_mutex.h b/srclib/apr/include/apr_proc_mutex.h
index 05c9f196..ceb9c82a 100644
--- a/srclib/apr/include/apr_proc_mutex.h
+++ b/srclib/apr/include/apr_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_random.h b/srclib/apr/include/apr_random.h
index b5c2baaa..9c0eac23 100644
--- a/srclib/apr/include/apr_random.h
+++ b/srclib/apr/include/apr_random.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_ring.h b/srclib/apr/include/apr_ring.h
index ba1ac1f7..eab1e69a 100644
--- a/srclib/apr/include/apr_ring.h
+++ b/srclib/apr/include/apr_ring.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_shm.h b/srclib/apr/include/apr_shm.h
index 2acb53e3..4875ee1f 100644
--- a/srclib/apr/include/apr_shm.h
+++ b/srclib/apr/include/apr_shm.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_signal.h b/srclib/apr/include/apr_signal.h
index 8cf65be8..991cbadb 100644
--- a/srclib/apr/include/apr_signal.h
+++ b/srclib/apr/include/apr_signal.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_strings.h b/srclib/apr/include/apr_strings.h
index 94e99c3f..fcfb7777 100644
--- a/srclib/apr/include/apr_strings.h
+++ b/srclib/apr/include/apr_strings.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -109,12 +109,14 @@ APR_DECLARE(char *) apr_pstrdup(apr_pool_t *p, const char *s);
APR_DECLARE(char *) apr_pstrmemdup(apr_pool_t *p, const char *s, apr_size_t n);
/**
- * duplicate the first n characters of a string into memory allocated
- * out of a pool; the new string will be null-terminated
+ * Duplicate at most n characters of a string into memory allocated
+ * out of a pool; the new string will be NUL-terminated
* @param p The pool to allocate out of
* @param s The string to duplicate
- * @param n The number of characters to duplicate
+ * @param n The maximum number of characters to duplicate
* @return The new string
+ * @remark The amount of memory allocated from the pool is the length
+ * of the returned string including the NUL terminator
*/
APR_DECLARE(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n);
diff --git a/srclib/apr/include/apr_support.h b/srclib/apr/include/apr_support.h
index 17a146a9..a6115172 100644
--- a/srclib/apr/include/apr_support.h
+++ b/srclib/apr/include/apr_support.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_tables.h b/srclib/apr/include/apr_tables.h
index c30fdcb0..6e9bb585 100644
--- a/srclib/apr/include/apr_tables.h
+++ b/srclib/apr/include/apr_tables.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_thread_cond.h b/srclib/apr/include/apr_thread_cond.h
index 8b8a5532..3744b090 100644
--- a/srclib/apr/include/apr_thread_cond.h
+++ b/srclib/apr/include/apr_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_thread_mutex.h b/srclib/apr/include/apr_thread_mutex.h
index 4d73164d..4596dce5 100644
--- a/srclib/apr/include/apr_thread_mutex.h
+++ b/srclib/apr/include/apr_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_thread_proc.h b/srclib/apr/include/apr_thread_proc.h
index edfcad10..c7930901 100644
--- a/srclib/apr/include/apr_thread_proc.h
+++ b/srclib/apr/include/apr_thread_proc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_thread_rwlock.h b/srclib/apr/include/apr_thread_rwlock.h
index b8890b9d..0bd958fb 100644
--- a/srclib/apr/include/apr_thread_rwlock.h
+++ b/srclib/apr/include/apr_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_time.h b/srclib/apr/include/apr_time.h
index 1882b283..253aa72b 100644
--- a/srclib/apr/include/apr_time.h
+++ b/srclib/apr/include/apr_time.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_user.h b/srclib/apr/include/apr_user.h
index 2529b791..0179e226 100644
--- a/srclib/apr/include/apr_user.h
+++ b/srclib/apr/include/apr_user.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/apr_version.h b/srclib/apr/include/apr_version.h
index 81e1dbcd..a3bd6b89 100644
--- a/srclib/apr/include/apr_version.h
+++ b/srclib/apr/include/apr_version.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -59,14 +59,14 @@
* The Patch Level never includes API changes, simply bug fixes.
* Reset to 0 when upgrading APR_MINOR_VERSION
*/
-#define APR_PATCH_VERSION 7
+#define APR_PATCH_VERSION 8
/**
* The symbol APR_IS_DEV_VERSION is only defined for internal,
* "development" copies of APR. It is undefined for released versions
* of APR.
*/
-#undef APR_IS_DEV_VERSION
+/* #define APR_IS_DEV_VERSION */
#if defined(APR_IS_DEV_VERSION) || defined(DOXYGEN)
diff --git a/srclib/apr/include/apr_want.h b/srclib/apr/include/apr_want.h
index c7556a79..39cc4fcb 100644
--- a/srclib/apr/include/apr_want.h
+++ b/srclib/apr/include/apr_want.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/aix/apr_arch_dso.h b/srclib/apr/include/arch/aix/apr_arch_dso.h
index cc9c0266..d1cac684 100644
--- a/srclib/apr/include/arch/aix/apr_arch_dso.h
+++ b/srclib/apr/include/arch/aix/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/apr_private_common.h b/srclib/apr/include/arch/apr_private_common.h
index c5fbbaa9..9cd52ecf 100644
--- a/srclib/apr/include/arch/apr_private_common.h
+++ b/srclib/apr/include/arch/apr_private_common.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_dso.h b/srclib/apr/include/arch/beos/apr_arch_dso.h
index 1bf3395c..fbc5c2ff 100644
--- a/srclib/apr/include/arch/beos/apr_arch_dso.h
+++ b/srclib/apr/include/arch/beos/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h b/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h
index 1325e00e..c60d8c62 100644
--- a/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h
+++ b/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_thread_cond.h b/srclib/apr/include/arch/beos/apr_arch_thread_cond.h
index b4584b47..c9420b53 100644
--- a/srclib/apr/include/arch/beos/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/beos/apr_arch_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h b/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h
index af9c96f8..bb7d4ae8 100644
--- a/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h
+++ b/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h b/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h
index 7f911816..694b0d50 100644
--- a/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h
+++ b/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/beos/apr_arch_threadproc.h b/srclib/apr/include/arch/beos/apr_arch_threadproc.h
index c11fe4e3..13de0536 100644
--- a/srclib/apr/include/arch/beos/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/beos/apr_arch_threadproc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_dso.h b/srclib/apr/include/arch/netware/apr_arch_dso.h
index 18d24036..ea0fe8c2 100644
--- a/srclib/apr/include/arch/netware/apr_arch_dso.h
+++ b/srclib/apr/include/arch/netware/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_file_io.h b/srclib/apr/include/arch/netware/apr_arch_file_io.h
index bcef9add..6b2bfeca 100644
--- a/srclib/apr/include/arch/netware/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/netware/apr_arch_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_global_mutex.h b/srclib/apr/include/arch/netware/apr_arch_global_mutex.h
index f8f534fe..4167d378 100644
--- a/srclib/apr/include/arch/netware/apr_arch_global_mutex.h
+++ b/srclib/apr/include/arch/netware/apr_arch_global_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_internal_time.h b/srclib/apr/include/arch/netware/apr_arch_internal_time.h
index 399ac72e..59f10672 100644
--- a/srclib/apr/include/arch/netware/apr_arch_internal_time.h
+++ b/srclib/apr/include/arch/netware/apr_arch_internal_time.h
@@ -1,9 +1,9 @@
-/* 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_networkio.h b/srclib/apr/include/arch/netware/apr_arch_networkio.h
index a15afc58..63f17abe 100644
--- a/srclib/apr/include/arch/netware/apr_arch_networkio.h
+++ b/srclib/apr/include/arch/netware/apr_arch_networkio.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_pre_nw.h b/srclib/apr/include/arch/netware/apr_arch_pre_nw.h
index 6c0026c6..36d9942c 100644
--- a/srclib/apr/include/arch/netware/apr_arch_pre_nw.h
+++ b/srclib/apr/include/arch/netware/apr_arch_pre_nw.h
@@ -11,12 +11,12 @@
#define N_PLAT_NLM
-/* 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.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h b/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h
index 09c325e4..7a634c2e 100644
--- a/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h
+++ b/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_thread_cond.h b/srclib/apr/include/arch/netware/apr_arch_thread_cond.h
index bfb5ece3..b11a5f86 100644
--- a/srclib/apr/include/arch/netware/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/netware/apr_arch_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h b/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h
index d9b599a0..0453799c 100644
--- a/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h
+++ b/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h b/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h
index b87e2d5d..d2dbd42f 100644
--- a/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h
+++ b/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_arch_threadproc.h b/srclib/apr/include/arch/netware/apr_arch_threadproc.h
index b30d6f6e..713ed295 100644
--- a/srclib/apr/include/arch/netware/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/netware/apr_arch_threadproc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/netware/apr_private.h b/srclib/apr/include/arch/netware/apr_private.h
index 04a3b0b9..ad659b59 100644
--- a/srclib/apr/include/arch/netware/apr_private.h
+++ b/srclib/apr/include/arch/netware/apr_private.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_dso.h b/srclib/apr/include/arch/os2/apr_arch_dso.h
index 9a202a3f..2bda6b7c 100644
--- a/srclib/apr/include/arch/os2/apr_arch_dso.h
+++ b/srclib/apr/include/arch/os2/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_file_io.h b/srclib/apr/include/arch/os2/apr_arch_file_io.h
index ff3b3145..a8884c34 100644
--- a/srclib/apr/include/arch/os2/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/os2/apr_arch_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_networkio.h b/srclib/apr/include/arch/os2/apr_arch_networkio.h
index dc8d9e70..10c6de81 100644
--- a/srclib/apr/include/arch/os2/apr_arch_networkio.h
+++ b/srclib/apr/include/arch/os2/apr_arch_networkio.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_os2calls.h b/srclib/apr/include/arch/os2/apr_arch_os2calls.h
index 3705ee94..3c739bfd 100644
--- a/srclib/apr/include/arch/os2/apr_arch_os2calls.h
+++ b/srclib/apr/include/arch/os2/apr_arch_os2calls.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h b/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h
index 737a162d..8caf3369 100644
--- a/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h
+++ b/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_thread_cond.h b/srclib/apr/include/arch/os2/apr_arch_thread_cond.h
index 05d56b6e..648b85d1 100644
--- a/srclib/apr/include/arch/os2/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/os2/apr_arch_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h b/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h
index b4454294..3ae2a41d 100644
--- a/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h
+++ b/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h b/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h
index b942d595..7187d5cb 100644
--- a/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h
+++ b/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os2/apr_arch_threadproc.h b/srclib/apr/include/arch/os2/apr_arch_threadproc.h
index 91ed2e3f..c8017adb 100644
--- a/srclib/apr/include/arch/os2/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/os2/apr_arch_threadproc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/os390/apr_arch_dso.h b/srclib/apr/include/arch/os390/apr_arch_dso.h
index 2cd2112a..4263297b 100644
--- a/srclib/apr/include/arch/os390/apr_arch_dso.h
+++ b/srclib/apr/include/arch/os390/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_dso.h b/srclib/apr/include/arch/unix/apr_arch_dso.h
index e5d9d830..d82182d4 100644
--- a/srclib/apr/include/arch/unix/apr_arch_dso.h
+++ b/srclib/apr/include/arch/unix/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_file_io.h b/srclib/apr/include/arch/unix/apr_arch_file_io.h
index 9437d679..05ef8ed7 100644
--- a/srclib/apr/include/arch/unix/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/unix/apr_arch_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_global_mutex.h b/srclib/apr/include/arch/unix/apr_arch_global_mutex.h
index e5724dc7..3add9ecf 100644
--- a/srclib/apr/include/arch/unix/apr_arch_global_mutex.h
+++ b/srclib/apr/include/arch/unix/apr_arch_global_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_inherit.h b/srclib/apr/include/arch/unix/apr_arch_inherit.h
index 22914e2e..9a6bdbca 100644
--- a/srclib/apr/include/arch/unix/apr_arch_inherit.h
+++ b/srclib/apr/include/arch/unix/apr_arch_inherit.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_internal_time.h b/srclib/apr/include/arch/unix/apr_arch_internal_time.h
index 321921e9..6e12c674 100644
--- a/srclib/apr/include/arch/unix/apr_arch_internal_time.h
+++ b/srclib/apr/include/arch/unix/apr_arch_internal_time.h
@@ -1,9 +1,9 @@
-/* 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_misc.h b/srclib/apr/include/arch/unix/apr_arch_misc.h
index 4168a2b5..82351250 100644
--- a/srclib/apr/include/arch/unix/apr_arch_misc.h
+++ b/srclib/apr/include/arch/unix/apr_arch_misc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_networkio.h b/srclib/apr/include/arch/unix/apr_arch_networkio.h
index 28aa1e64..91018f7c 100644
--- a/srclib/apr/include/arch/unix/apr_arch_networkio.h
+++ b/srclib/apr/include/arch/unix/apr_arch_networkio.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_poll_private.h b/srclib/apr/include/arch/unix/apr_arch_poll_private.h
index c653a808..f176eac0 100644
--- a/srclib/apr/include/arch/unix/apr_arch_poll_private.h
+++ b/srclib/apr/include/arch/unix/apr_arch_poll_private.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h b/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h
index 3ed046cb..ec9796bc 100644
--- a/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h
+++ b/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_shm.h b/srclib/apr/include/arch/unix/apr_arch_shm.h
index b57df765..dbd9b9bc 100644
--- a/srclib/apr/include/arch/unix/apr_arch_shm.h
+++ b/srclib/apr/include/arch/unix/apr_arch_shm.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_thread_cond.h b/srclib/apr/include/arch/unix/apr_arch_thread_cond.h
index 643b01d5..5c2b51d1 100644
--- a/srclib/apr/include/arch/unix/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/unix/apr_arch_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h b/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h
index 6b1b6717..40cdef3c 100644
--- a/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h
+++ b/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h b/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h
index c4631897..2cb43af6 100644
--- a/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h
+++ b/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/unix/apr_arch_threadproc.h b/srclib/apr/include/arch/unix/apr_arch_threadproc.h
index bb91ef7f..6b018023 100644
--- a/srclib/apr/include/arch/unix/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/unix/apr_arch_threadproc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_atime.h b/srclib/apr/include/arch/win32/apr_arch_atime.h
index bf09a328..47b75a95 100644
--- a/srclib/apr/include/arch/win32/apr_arch_atime.h
+++ b/srclib/apr/include/arch/win32/apr_arch_atime.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_dso.h b/srclib/apr/include/arch/win32/apr_arch_dso.h
index e26f4ecc..e2e4e40f 100644
--- a/srclib/apr/include/arch/win32/apr_arch_dso.h
+++ b/srclib/apr/include/arch/win32/apr_arch_dso.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_file_io.h b/srclib/apr/include/arch/win32/apr_arch_file_io.h
index 3af8720b..35c3c072 100644
--- a/srclib/apr/include/arch/win32/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/win32/apr_arch_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_inherit.h b/srclib/apr/include/arch/win32/apr_arch_inherit.h
index b7eb1e67..97c7d05d 100644
--- a/srclib/apr/include/arch/win32/apr_arch_inherit.h
+++ b/srclib/apr/include/arch/win32/apr_arch_inherit.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_misc.h b/srclib/apr/include/arch/win32/apr_arch_misc.h
index 2e032e8a..6db6a1b9 100644
--- a/srclib/apr/include/arch/win32/apr_arch_misc.h
+++ b/srclib/apr/include/arch/win32/apr_arch_misc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_networkio.h b/srclib/apr/include/arch/win32/apr_arch_networkio.h
index e58b1d65..d4e434d0 100644
--- a/srclib/apr/include/arch/win32/apr_arch_networkio.h
+++ b/srclib/apr/include/arch/win32/apr_arch_networkio.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h b/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h
index aaac5a30..4e3e3993 100644
--- a/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h
+++ b/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_thread_cond.h b/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
index 01252328..840949c2 100644
--- a/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h b/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h
index e180b7d4..13d3c1cb 100644
--- a/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h
+++ b/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h b/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h
index 5a41fb97..1177e529 100644
--- a/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h
+++ b/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_threadproc.h b/srclib/apr/include/arch/win32/apr_arch_threadproc.h
index 3fb64a0e..7af8ab68 100644
--- a/srclib/apr/include/arch/win32/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/win32/apr_arch_threadproc.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_arch_utf8.h b/srclib/apr/include/arch/win32/apr_arch_utf8.h
index c3ca6274..84f8bf77 100644
--- a/srclib/apr/include/arch/win32/apr_arch_utf8.h
+++ b/srclib/apr/include/arch/win32/apr_arch_utf8.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h b/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h
index 291d77db..471cd66d 100644
--- a/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h
+++ b/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
diff --git a/srclib/apr/include/arch/win32/apr_private.h b/srclib/apr/include/arch/win32/apr_private.h
index ac93d1ed..0dc5f989 100644
--- a/srclib/apr/include/arch/win32/apr_private.h
+++ b/srclib/apr/include/arch/win32/apr_private.h
@@ -1,9 +1,9 @@
-/* Copyright 2000-2005 The Apache Software Foundation or its licensors, 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
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*