[tomcat-native] 01/08: Merge tag 'upstream/1.2.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 12:45:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat-native.
commit 652ab037d3aa3f85692ccda665e1c29dcd081a6e
Merge: 1cd657b bd8f106
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Oct 30 15:17:13 2015 +0100
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
CHANGELOG.txt | 201 +-
CMakeLists.txt | 840 +++++++++
NOTICE | 6 +
README.txt | 6 +-
TODO.txt | 4 -
....properties.default => build.properties.default | 8 +-
jni/build.xml => build.xml | 10 +-
{jni/docs => docs}/images/add.gif | Bin
{jni/docs => docs}/images/asf-feather.png | Bin
{jni/docs => docs}/images/code.gif | Bin
{jni/docs => docs}/images/design.gif | Bin
{jni/docs => docs}/images/docs-stylesheet.css | 0
{jni/docs => docs}/images/docs.gif | Bin
{jni/docs => docs}/images/fix.gif | Bin
{jni/docs => docs}/images/printer.gif | Bin
{jni/docs => docs}/images/style.css | 0
{jni/docs => docs}/images/tomcat.gif | Bin
{jni/docs => docs}/images/tomcat.png | Bin
{jni/docs => docs}/images/update.gif | Bin
{jni/docs => docs}/images/void.gif | Bin
{jni/docs => docs}/index.html | 24 +-
docs/miscellaneous/changelog.html | 35 +
jni/docs/news/2011.html => docs/news/2015.html | 15 +-
{jni/examples => examples}/mkcerts | 0
.../org/apache/tomcat/jni/Echo.java | 3 -
.../org/apache/tomcat/jni/Echo.properties | 0
.../org/apache/tomcat/jni/Local.properties | 0
.../org/apache/tomcat/jni/LocalServer.java | 3 -
.../org/apache/tomcat/jni/SSL.properties | 0
.../org/apache/tomcat/jni/SSLServer.java | 3 -
{jni/java => java}/org/apache/tomcat/Apr.java | 0
.../java => java}/org/apache/tomcat/apr.properties | 0
.../org/apache/tomcat/jni/Address.java | 0
.../org/apache/tomcat/jni/BIOCallback.java | 0
.../org/apache/tomcat/jni/Buffer.java | 0
.../org/apache/tomcat/jni/CertificateVerifier.java | 28 +-
.../org/apache/tomcat/jni/Directory.java | 0
.../java => java}/org/apache/tomcat/jni/Error.java | 0
{jni/java => java}/org/apache/tomcat/jni/File.java | 0
.../org/apache/tomcat/jni/FileInfo.java | 0
.../org/apache/tomcat/jni/Global.java | 0
.../org/apache/tomcat/jni/Library.java | 0
.../apache/tomcat/jni/LibraryNotFoundError.java | 0
.../java => java}/org/apache/tomcat/jni/Local.java | 0
{jni/java => java}/org/apache/tomcat/jni/Lock.java | 0
{jni/java => java}/org/apache/tomcat/jni/Mmap.java | 0
.../org/apache/tomcat/jni/Multicast.java | 0
{jni/java => java}/org/apache/tomcat/jni/OS.java | 0
.../org/apache/tomcat/jni/PasswordCallback.java | 0
{jni/java => java}/org/apache/tomcat/jni/Poll.java | 0
{jni/java => java}/org/apache/tomcat/jni/Pool.java | 0
.../org/apache/tomcat/jni/PoolCallback.java | 0
{jni/java => java}/org/apache/tomcat/jni/Proc.java | 0
.../org/apache/tomcat/jni/ProcErrorCallback.java | 0
.../org/apache/tomcat/jni/Procattr.java | 0
.../org/apache/tomcat/jni/Registry.java | 0
{jni/java => java}/org/apache/tomcat/jni/SSL.java | 326 +++-
.../org/apache/tomcat/jni/SSLContext.java | 229 ++-
.../org/apache/tomcat/jni/SSLExt.java | 0
.../org/apache/tomcat/jni/SSLSocket.java | 15 +
{jni/java => java}/org/apache/tomcat/jni/Shm.java | 0
.../org/apache/tomcat/jni/Sockaddr.java | 0
.../org/apache/tomcat/jni/Socket.java | 11 +-
.../org/apache/tomcat/jni/Status.java | 0
.../org/apache/tomcat/jni/Stdlib.java | 0
.../org/apache/tomcat/jni/Thread.java | 0
{jni/java => java}/org/apache/tomcat/jni/Time.java | 0
{jni/java => java}/org/apache/tomcat/jni/User.java | 0
.../org/apache/tomcat/jni/socket/AprSocket.java | 0
.../apache/tomcat/jni/socket/AprSocketContext.java | 0
.../org/apache/tomcat/jni/socket/HostInfo.java | 0
{jni/java => java}/overview.html | 0
jni/docs/miscellaneous/changelog.html | 344 ----
jni/docs/news/2008.html | 28 -
jni/docs/news/2009.html | 12 -
jni/docs/news/2010.html | 17 -
jni/docs/news/2012.html | 23 -
jni/docs/news/2013.html | 26 -
jni/docs/news/2014.html | 23 -
jni/native/build-outputs.mk | 62 -
jni/native/build/apr_common.m4 | 990 ----------
jni/native/build/config.guess | 1420 ---------------
jni/native/build/config.sub | 1793 ------------------
jni/native/build/find_apr.m4 | 202 ---
jni/native/build/install.sh | 112 --
jni/native/build/tcnative.m4 | 413 -----
jni/native/src/sslcontext.c | 841 ---------
jni/native/srclib/VERSIONS | 4 -
jni/xdocs/miscellaneous/changelog.xml | 399 ----
jni/xdocs/news/2008.xml | 57 -
jni/xdocs/news/2009.xml | 41 -
jni/xdocs/news/2010.xml | 46 -
jni/xdocs/news/2012.xml | 52 -
jni/xdocs/news/2013.xml | 55 -
jni/xdocs/news/2014.xml | 52 -
jni/jnirelease.sh => jnirelease.sh | 190 +-
{jni/native => native}/BUILDING | 10 +-
{jni/native => native}/Makefile.in | 0
{jni/native => native}/NMAKEmakefile | 0
{jni/native => native}/NMAKEmakefile.inc | 0
{jni/native => native}/build.conf | 0
native/build/PrintPath | 130 ++
{jni/native => native}/build/buildcheck.sh | 0
{jni/native => native}/build/get-version.sh | 0
{jni/native => native}/build/lineends.pl | 0
{jni/native => native}/build/mkdir.sh | 0
{jni/native => native}/build/rpm/tcnative.spec.in | 12 +-
native/build/tcnative.m4 | 301 +++
{jni/native => native}/buildconf | 2 +-
{jni/native => native}/config.layout | 0
{jni/native => native}/configure | 1192 +++---------
{jni/native => native}/configure.in | 18 +-
{jni/native => native}/include/ssl_private.h | 127 +-
{jni/native => native}/include/tcn.h | 21 -
{jni/native => native}/include/tcn_api.h | 6 -
{jni/native => native}/include/tcn_version.h | 11 +-
{jni/native => native}/libtcnative.dsp | 4 +-
{jni/native => native}/libtcnative.dsw | 0
{jni/native => native}/os/netware/system.c | 6 -
{jni/native => native}/os/unix/system.c | 6 -
{jni/native => native}/os/unix/uxpipe.c | 3 -
{jni/native => native}/os/win32/apache.ico | Bin
{jni/native => native}/os/win32/libtcnative.rc | 11 +-
{jni/native => native}/os/win32/logmessages.bin | Bin
{jni/native => native}/os/win32/logmessages.mc | 0
{jni/native => native}/os/win32/ntpipe.c | 3 -
{jni/native => native}/os/win32/registry.c | 6 -
{jni/native => native}/os/win32/system.c | 6 -
{jni/native => native}/src/address.c | 6 -
{jni/native => native}/src/bb.c | 6 -
{jni/native => native}/src/dir.c | 6 -
{jni/native => native}/src/error.c | 6 -
{jni/native => native}/src/file.c | 6 -
{jni/native => native}/src/info.c | 6 -
{jni/native => native}/src/jnilib.c | 30 +-
{jni/native => native}/src/lock.c | 6 -
{jni/native => native}/src/misc.c | 6 -
{jni/native => native}/src/mmap.c | 6 -
{jni/native => native}/src/multicast.c | 6 -
{jni/native => native}/src/network.c | 66 +-
{jni/native => native}/src/os.c | 6 -
{jni/native => native}/src/poll.c | 95 +-
{jni/native => native}/src/pool.c | 19 +-
{jni/native => native}/src/proc.c | 6 -
{jni/native => native}/src/shm.c | 6 -
{jni/native => native}/src/ssl.c | 1090 +++++++++--
native/src/sslcontext.c | 1918 ++++++++++++++++++++
{jni/native => native}/src/sslinfo.c | 38 +-
{jni/native => native}/src/sslnetwork.c | 230 +--
{jni/native => native}/src/sslutils.c | 389 ++--
{jni/native => native}/src/stdlib.c | 6 -
{jni/native => native}/src/thread.c | 6 -
{jni/native => native}/src/user.c | 6 -
{jni/native => native}/srclib/BUILDING | 0
native/srclib/VERSIONS | 4 +
{jni/native => native}/srclib/apr/NMAKEmakefile | 0
.../srclib/apr/apr-enable-ipv6.patch | 4 +-
.../srclib/openssl/openssl-msvcrt.patch | 0
{jni/native => native}/tcnative.dsp | 4 +-
{jni/native => native}/tcnative.pc.in | 2 +-
{jni/native => native}/tcnative.spec | 14 +-
.../org/apache/tomcat/jni/FileTestSuite.java | 2 -
.../apache/tomcat/jni/SocketServerTestBind.java | 2 -
.../apache/tomcat/jni/SocketServerTestSuite.java | 2 -
{jni/xdocs => xdocs}/build.xml | 0
{jni/xdocs => xdocs}/images/add.gif | Bin
{jni/xdocs => xdocs}/images/asf-feather.png | Bin
{jni/xdocs => xdocs}/images/code.gif | Bin
{jni/xdocs => xdocs}/images/design.gif | Bin
{jni/xdocs => xdocs}/images/docs-stylesheet.css | 0
{jni/xdocs => xdocs}/images/docs.gif | Bin
{jni/xdocs => xdocs}/images/fix.gif | Bin
{jni/xdocs => xdocs}/images/printer.gif | Bin
{jni/xdocs => xdocs}/images/style.css | 0
{jni/xdocs => xdocs}/images/tomcat.gif | Bin
{jni/xdocs => xdocs}/images/tomcat.png | Bin
{jni/xdocs => xdocs}/images/update.gif | Bin
{jni/xdocs => xdocs}/images/void.gif | Bin
{jni/xdocs => xdocs}/index.xml | 22 +-
xdocs/miscellaneous/changelog.xml | 66 +
{jni/xdocs => xdocs}/miscellaneous/project.xml | 8 +-
jni/xdocs/news/2011.xml => xdocs/news/2015.xml | 19 +-
{jni/xdocs => xdocs}/news/project.xml | 8 +-
{jni/xdocs => xdocs}/project.xml | 8 +-
{jni/xdocs => xdocs}/style.xsl | 2 -
185 files changed, 5776 insertions(+), 9206 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat-native.git
More information about the pkg-java-commits
mailing list