[tomcat-native] 02/04: Merge tag 'upstream/1.2.12'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch experimental
in repository tomcat-native.

commit be2a5bddbdbf4815c2627ab9e780ae4dcaa8eb92
Merge: 7e38966 04d164a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun May 14 12:24:27 2017 +0200

    Merge tag 'upstream/1.2.12'
    
    Upstream version 1.2.12

 CHANGELOG.txt                                      |   36 +-
 NOTICE                                             |    2 +-
 build.properties.default                           |   26 +-
 build.xml                                          |   39 +-
 docs/index.html                                    |   26 +-
 docs/miscellaneous/changelog.html                  |   56 +-
 docs/news/2008.html                                |    2 +-
 docs/news/2009.html                                |    2 +-
 docs/news/2010.html                                |    2 +-
 docs/news/2011.html                                |    2 +-
 docs/news/2012.html                                |    2 +-
 docs/news/2013.html                                |    2 +-
 docs/news/2014.html                                |    2 +-
 docs/news/2015.html                                |    2 +-
 docs/news/2016.html                                |    9 +-
 examples/org/apache/tomcat/jni/Echo.java           |    6 +-
 examples/org/apache/tomcat/jni/LocalServer.java    |    7 +-
 examples/org/apache/tomcat/jni/SSLServer.java      |    7 +-
 java/org/apache/tomcat/Apr.java                    |   25 +-
 java/org/apache/tomcat/jni/File.java               |    8 +-
 java/org/apache/tomcat/jni/Registry.java           |    2 +-
 java/org/apache/tomcat/jni/Status.java             |    2 +-
 native/BUILDING                                    |  219 +-
 native/NMAKEmakefile                               |   24 +-
 native/build/config.guess                          |   10 +-
 native/build/config.sub                            |   22 +-
 native/build/tcnative.m4                           |   11 +-
 native/configure                                   | 5348 --------------------
 native/configure.in                                |   21 +-
 native/include/ssl_private.h                       |    7 +
 native/include/tcn_api.h                           |    2 +-
 native/include/tcn_version.h                       |    2 +-
 native/os/win32/libtcnative.rc                     |    6 +-
 native/os/win32/system.c                           |    3 +
 native/src/file.c                                  |    4 -
 native/src/info.c                                  |   10 +-
 native/src/network.c                               |    1 +
 native/src/pool.c                                  |    2 +
 native/src/ssl.c                                   |   51 +-
 native/src/sslcontext.c                            |   47 +-
 native/src/sslnetwork.c                            |    8 +-
 native/src/sslutils.c                              |    2 +-
 native/srclib/VERSIONS                             |    2 +-
 native/tcnative.spec                               |    2 +-
 test/org/apache/tomcat/jni/AbstractJniTest.java    |   46 +
 test/org/apache/tomcat/jni/FileTestSuite.java      |   41 -
 .../apache/tomcat/jni/SocketServerTestBind.java    |  130 -
 .../apache/tomcat/jni/SocketServerTestSuite.java   |  204 -
 test/org/apache/tomcat/jni/TestFile.java           |   67 +
 test/org/apache/tomcat/jni/TestSocketServer.java   |  219 +
 .../jni/TestSocketServerAnyLocalAddress.java       |  204 +
 xdocs/index.xml                                    |   26 +-
 xdocs/miscellaneous/changelog.xml                  |   56 +
 xdocs/news/2016.xml                                |    7 +
 xdocs/style.xsl                                    |    2 +-
 55 files changed, 1106 insertions(+), 5967 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat-native.git