--- a/components/apr-1_5/Makefile Wed Apr 06 02:23:05 2016 -0700
+++ b/components/apr-1_5/Makefile Thu Apr 07 01:49:33 2016 -0700
@@ -28,14 +28,14 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= apr
-COMPONENT_VERSION= 1.5.1
+COMPONENT_VERSION= 1.5.2
COMPONENT_PROJECT_URL= http://apr.apache.org/
COMPONENT_ARCHIVE_HASH= \
- sha256:94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7
+ sha256:1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/apache
-TPNO= 20711
+TPNO= 27510
CONFIGURE_DEFAULT_DIRS=no
include $(WS_MAKE_RULES)/common.mk
@@ -59,6 +59,11 @@
COMPONENT_TEST_TARGETS= test
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "/microseconds: [0-9]* usec/d" ' \
+ '-e "/^APR Lock Performance Test/,/make\[2\]: Leaving directory/p" ' \
+ '-e "/.*/d" '
+
# Some patches need configure script recreation; autoreconf is not used here as
# it will overwrite the patch to the libtool scripts.
COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
--- a/components/apr-1_5/apr.license Wed Apr 06 02:23:05 2016 -0700
+++ b/components/apr-1_5/apr.license Thu Apr 07 01:49:33 2016 -0700
@@ -1,5 +1,5 @@
Apache Portable Runtime
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -15,17 +15,6 @@
Caldera International Inc.
-The following applies to all products licensed under the Apache 2.0 License:
-
-You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
-
-You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also reproduced below.
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and limitations under the License.
-
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/test/results-32.master Thu Apr 07 01:49:33 2016 -0700
@@ -0,0 +1,216 @@
+APR Lock Performance Test
+==============
+
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 1 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 1 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 1 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 2 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 2 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 2 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 3 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 3 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 3 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 4 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 4 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 4 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 5 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 5 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 5 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 6 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 6 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 6 threads OK
+Trying proc mutexes with mechanism `default'...
+ Mutex mechanism `default' is global in scope on this platform.
+Trying global mutexes with mechanism `default'...
+ no problems encountered...
+Trying proc mutexes with mechanism `sysvsem'...
+ Mutex mechanism `sysvsem' is global in scope on this platform.
+Trying global mutexes with mechanism `sysvsem'...
+ no problems encountered...
+Trying proc mutexes with mechanism `posix'...
+ Mutex mechanism `posix' is global in scope on this platform.
+Trying global mutexes with mechanism `posix'...
+ no problems encountered...
+Trying proc mutexes with mechanism `fcntl'...
+ Mutex mechanism `fcntl' is not global in scope on this platform.
+Trying global mutexes with mechanism `fcntl'...
+ no problems encountered...
+Trying proc mutexes with mechanism `proc_pthread'...
+ Mutex mechanism `proc_pthread' is global in scope on this platform.
+Trying global mutexes with mechanism `proc_pthread'...
+ no problems encountered...
+testatomic : SUCCESS
+testdir : SUCCESS
+testdso : SUCCESS
+testdup : SUCCESS
+testenv : SUCCESS
+testescape : SUCCESS
+testfile : SUCCESS
+testfilecopy : SUCCESS
+testfileinfo : SUCCESS
+testflock : SUCCESS
+testfmt : SUCCESS
+testfnmatch : SUCCESS
+testargs : SUCCESS
+testhash : SUCCESS
+testipsub : SUCCESS
+testlock : SUCCESS
+testcond : SUCCESS
+testlfs : SUCCESS
+testmmap : SUCCESS
+testnames : SUCCESS
+testoc : SUCCESS
+testpath : SUCCESS
+testpipe : SUCCESS
+testpoll : SUCCESS
+testpools : SUCCESS
+testproc : SUCCESS
+testprocmutex : SUCCESS
+testrand : SUCCESS
+testsleep : SUCCESS
+testshm : SUCCESS
+testsock : SUCCESS
+testsockets : SUCCESS
+testsockopt : SUCCESS
+teststr : SUCCESS
+teststrnatcmp : SUCCESS
+testtable : SUCCESS
+testtemp : SUCCESS
+testthread : SUCCESS
+testtime : SUCCESS
+testud : SUCCESS
+testuser : SUCCESS
+testvsn : SUCCESS
+testskiplist : SUCCESS
+All tests passed.
+Creating a test file...
+Sending the file...
+apr_socket_sendfile() updated offset with 0
+apr_socket_sendfile() updated len with 370049
+bytes really sent: 370049
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+Creating a test file...
+Sending the file...
+Calling apr_socket_sendfile()...
+Headers (3):
+ 15 bytes (1)
+ 5 bytes (E)
+ 80000 bytes (^)
+File: 200000 bytes from offset 0
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 145556 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 134464 bytes from offset 65536
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->11, sent 0 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 134464 bytes from offset 65536
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 131072 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 3392 bytes from offset 196608
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->11, sent 0 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 3392 bytes from offset 196608
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 93421 bytes
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+Creating a test file...
+Sending the file...
+Calling apr_socket_sendfile()...
+Headers (3):
+ 15 bytes (1)
+ 5 bytes (E)
+ 80000 bytes (^)
+File: 200000 bytes from offset 0
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 145556 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 134464 bytes from offset 65536
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 131072 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 3392 bytes from offset 196608
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 93421 bytes
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+make[2]: Leaving directory '$(@D)/test'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/test/results-64.master Thu Apr 07 01:49:33 2016 -0700
@@ -0,0 +1,211 @@
+APR Lock Performance Test
+==============
+
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 1 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 1 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 1 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 2 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 2 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 2 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 3 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 3 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 3 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 4 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 4 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 4 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 5 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 5 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 5 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (UNNESTED) OK
+ Starting 6 threads OK
+apr_thread_mutex_t Tests
+ Initializing the apr_thread_mutex_t (NESTED) OK
+ Starting 6 threads OK
+apr_thread_rwlock_t Tests
+ Initializing the apr_thread_rwlock_t OK
+ Starting 6 threads OK
+Trying proc mutexes with mechanism `default'...
+ Mutex mechanism `default' is global in scope on this platform.
+Trying global mutexes with mechanism `default'...
+ no problems encountered...
+Trying proc mutexes with mechanism `sysvsem'...
+ Mutex mechanism `sysvsem' is global in scope on this platform.
+Trying global mutexes with mechanism `sysvsem'...
+ no problems encountered...
+Trying proc mutexes with mechanism `posix'...
+ Mutex mechanism `posix' is global in scope on this platform.
+Trying global mutexes with mechanism `posix'...
+ no problems encountered...
+Trying proc mutexes with mechanism `fcntl'...
+ Mutex mechanism `fcntl' is not global in scope on this platform.
+Trying global mutexes with mechanism `fcntl'...
+ no problems encountered...
+Trying proc mutexes with mechanism `proc_pthread'...
+ Mutex mechanism `proc_pthread' is global in scope on this platform.
+Trying global mutexes with mechanism `proc_pthread'...
+ no problems encountered...
+testatomic : SUCCESS
+testdir : SUCCESS
+testdso : SUCCESS
+testdup : SUCCESS
+testenv : SUCCESS
+testescape : SUCCESS
+testfile : SUCCESS
+testfilecopy : SUCCESS
+testfileinfo : SUCCESS
+testflock : SUCCESS
+testfmt : SUCCESS
+testfnmatch : SUCCESS
+testargs : SUCCESS
+testhash : SUCCESS
+testipsub : SUCCESS
+testlock : SUCCESS
+testcond : SUCCESS
+testlfs : Line 345: Large Files not supported
+SUCCESS
+testmmap : SUCCESS
+testnames : SUCCESS
+testoc : SUCCESS
+testpath : SUCCESS
+testpipe : SUCCESS
+testpoll : SUCCESS
+testpools : SUCCESS
+testproc : SUCCESS
+testprocmutex : SUCCESS
+testrand : SUCCESS
+testsleep : SUCCESS
+testshm : SUCCESS
+testsock : SUCCESS
+testsockets : SUCCESS
+testsockopt : SUCCESS
+teststr : SUCCESS
+teststrnatcmp : SUCCESS
+testtable : SUCCESS
+testtemp : SUCCESS
+testthread : SUCCESS
+testtime : SUCCESS
+testud : SUCCESS
+testuser : SUCCESS
+testvsn : SUCCESS
+testskiplist : SUCCESS
+All tests passed.
+Creating a test file...
+Sending the file...
+apr_socket_sendfile() updated offset with 0
+apr_socket_sendfile() updated len with 370049
+bytes really sent: 370049
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+Creating a test file...
+Sending the file...
+Calling apr_socket_sendfile()...
+Headers (3):
+ 15 bytes (1)
+ 5 bytes (E)
+ 80000 bytes (^)
+File: 200000 bytes from offset 0
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 211092 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 68928 bytes from offset 131072
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->11, sent 0 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 68928 bytes from offset 131072
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 134397 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 0 bytes from offset 0
+Trailers (1):
+ 24560 bytes
+apr_socket_sendfile()->11, sent 0 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 0 bytes from offset 0
+Trailers (1):
+ 24560 bytes
+apr_socket_sendfile()->0, sent 24560 bytes
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+Creating a test file...
+Sending the file...
+Calling apr_socket_sendfile()...
+Headers (3):
+ 15 bytes (1)
+ 5 bytes (E)
+ 80000 bytes (^)
+File: 200000 bytes from offset 0
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 211092 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 68928 bytes from offset 131072
+Trailers (3):
+ 19 bytes
+ 10 bytes
+ 90000 bytes
+apr_socket_sendfile()->0, sent 134397 bytes
+Calling apr_socket_sendfile()...
+Headers (0):
+File: 0 bytes from offset 0
+Trailers (1):
+ 24560 bytes
+apr_socket_sendfile()->0, sent 24560 bytes
+After apr_socket_sendfile(), the kernel file pointer is at offset 0.
+client: apr_socket_sendfile() worked as expected!
+Waiting for a client to connect...
+Processing a client...
+server: apr_socket_sendfile() worked as expected!
+make[2]: Leaving directory '$(@D)/test'