[apr] 02/06: Merge branch 'upstream'
Stefan Fritsch
sf at moszumanska.debian.org
Fri Aug 4 15:48:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr.
commit 32ee30abf9178f1b9dc98877be0ce47ab0b81a2c
Merge: a67de57 171cb6d
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Fri Aug 4 16:14:13 2017 +0200
Merge branch 'upstream'
CHANGES | 219 +-
CMakeLists.txt | 4 +
Makefile.in | 2 +
Makefile.win | 10 -
NOTICE | 2 +-
NWGNUmakefile | 1 +
apr.dsp | 127 +-
apr.mak | 528 +--
apr.spec | 4 +-
build-outputs.mk | 178 +-
build/apr_network.m4 | 30 +
build/config.guess | 184 +-
build/config.sub | 83 +-
build/cvtdsp.pl | 76 +-
build/libtool.m4 | 2566 +++++++------
build/ltmain.sh | 5528 ++++++++++++++++++-----------
build/ltoptions.m4 | 127 +-
build/ltsugar.m4 | 7 +-
build/ltversion.m4 | 12 +-
build/lt~obsolete.m4 | 7 +-
build/make_nw_export.awk | 2 +
build/rpm/apr.spec.in | 2 +-
configure | 2458 ++++++++-----
configure.in | 50 +-
docs/pool-design.html | 2 +-
encoding/apr_escape.c | 71 +
file_io/netware/pipe.c | 68 +-
file_io/os2/pipe.c | 76 +-
file_io/unix/copy.c | 1 +
file_io/unix/flock.c | 8 +-
file_io/unix/pipe.c | 64 +-
file_io/unix/readwrite.c | 2 +
file_io/win32/filepath.c | 4 +-
file_io/win32/filestat.c | 18 +
file_io/win32/pipe.c | 25 +-
include/apr.h.in | 1 +
include/apr.hnw | 1 +
include/apr.hw | 42 +-
include/apr.hwc | 40 +-
include/apr_allocator.h | 10 +
include/apr_cstr.h | 292 ++
include/apr_errno.h | 31 +-
include/apr_escape.h | 46 +-
include/apr_file_io.h | 34 +-
include/apr_global_mutex.h | 21 +-
include/apr_hash.h | 3 +-
include/apr_network_io.h | 47 +
include/apr_perms_set.h | 65 +
include/apr_poll.h | 45 +-
include/apr_portable.h | 45 +-
include/apr_proc_mutex.h | 19 +-
include/apr_shm.h | 21 +
include/apr_skiplist.h | 126 +-
include/apr_tables.h | 20 +-
include/apr_thread_proc.h | 13 +
include/apr_version.h | 4 +-
include/arch/unix/apr_arch_networkio.h | 3 +
include/arch/unix/apr_arch_poll_private.h | 15 +-
include/arch/unix/apr_arch_proc_mutex.h | 26 +-
include/arch/unix/apr_arch_shm.h | 1 +
include/arch/unix/apr_arch_threadproc.h | 10 +
include/arch/unix/apr_private.h.in | 21 +-
libapr.dsp | 118 +-
libapr.mak | 526 +--
locks/beos/proc_mutex.c | 42 +-
locks/netware/proc_mutex.c | 79 +-
locks/os2/proc_mutex.c | 45 +-
locks/unix/global_mutex.c | 18 +-
locks/unix/proc_mutex.c | 488 ++-
locks/win32/proc_mutex.c | 48 +-
memory/unix/apr_pools.c | 359 +-
network_io/unix/multicast.c | 2 +-
network_io/unix/sockaddr.c | 77 +
network_io/unix/sockets.c | 61 +-
network_io/unix/sockopt.c | 35 +
poll/os2/pollset.c | 103 +-
poll/unix/epoll.c | 35 +-
poll/unix/kqueue.c | 28 +-
poll/unix/poll.c | 20 +-
poll/unix/pollcb.c | 49 +
poll/unix/pollset.c | 121 +-
poll/unix/port.c | 24 +-
poll/unix/select.c | 6 +-
poll/unix/wakeup.c | 151 +
poll/unix/z_asio.c | 15 +-
shmem/beos/shm.c | 12 +
shmem/os2/shm.c | 7 +
shmem/unix/shm.c | 51 +-
shmem/win32/shm.c | 12 +
strings/apr_cpystrn.c | 2 +
strings/apr_cstr.c | 403 +++
strings/apr_fnmatch.c | 2 +-
strings/apr_snprintf.c | 2 +-
tables/apr_skiplist.c | 211 +-
tables/apr_tables.c | 4 +
test/sockchild.c | 4 +-
test/testdll.dsp | 4 -
test/testescape.c | 36 +
test/testlfs.c | 7 +-
test/testlib.dsp | 4 -
test/testmutexscope.c | 2 +-
test/testnames.c | 34 +
test/testpipe.c | 6 +-
test/testpoll.c | 38 +-
test/testprocmutex.c | 20 +-
test/testshm.c | 41 +
test/testskiplist.c | 158 +-
test/testsock.c | 107 +-
test/teststr.c | 13 +
test/testtable.c | 24 +
threadproc/beos/proc.c | 8 +
threadproc/netware/proc.c | 8 +
threadproc/os2/proc.c | 8 +
threadproc/unix/proc.c | 30 +-
threadproc/win32/proc.c | 14 +-
tools/gen_test_char.c | 18 +-
user/win32/groupinfo.c | 4 +-
user/win32/userinfo.c | 4 +-
118 files changed, 11074 insertions(+), 6222 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git
More information about the Pkg-apache-commits
mailing list