[tomcat-native] 03/08: Merge tag 'upstream/1.2.7'

[Emmanuel Bourg]

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 4c674b64e0b6176caf230342bc5fe64f7f1b2ff5
Merge: 0623536 e226cbd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 18 12:45:56 2016 +0200

    Merge tag 'upstream/1.2.7'
    
    Upstream version 1.2.7

 CHANGELOG.txt                                      |  113 +-
 CMakeLists.txt                                     |    1 -
 NOTICE                                             |    2 +-
 TODO.txt                                           |    8 -
 build.properties.default                           |    4 +-
 build.xml                                          |    4 +-
 docs/index.html                                    |   17 +-
 docs/miscellaneous/changelog.html                  |  108 +-
 docs/news/2008.html                                |    4 +-
 docs/news/2009.html                                |    4 +-
 docs/news/2010.html                                |    4 +-
 docs/news/2011.html                                |    4 +-
 docs/news/2012.html                                |    4 +-
 docs/news/2013.html                                |    4 +-
 docs/news/2014.html                                |    4 +-
 docs/news/2015.html                                |   23 +-
 docs/news/2016.html                                |   23 +
 java/org/apache/tomcat/jni/Address.java            |    7 +-
 java/org/apache/tomcat/jni/Buffer.java             |    2 +
 java/org/apache/tomcat/jni/Directory.java          |   11 +-
 java/org/apache/tomcat/jni/File.java               |   33 +-
 java/org/apache/tomcat/jni/Global.java             |    6 +
 java/org/apache/tomcat/jni/Library.java            |    2 +-
 java/org/apache/tomcat/jni/Local.java              |    9 +-
 java/org/apache/tomcat/jni/Lock.java               |   10 +
 java/org/apache/tomcat/jni/Mmap.java               |    4 +
 java/org/apache/tomcat/jni/Multicast.java          |    5 +
 java/org/apache/tomcat/jni/OS.java                 |    4 +
 java/org/apache/tomcat/jni/Poll.java               |    9 +-
 java/org/apache/tomcat/jni/Pool.java               |    1 +
 java/org/apache/tomcat/jni/Proc.java               |    5 +
 java/org/apache/tomcat/jni/Procattr.java           |   14 +-
 java/org/apache/tomcat/jni/Registry.java           |   10 +
 java/org/apache/tomcat/jni/SSL.java                |   84 +-
 java/org/apache/tomcat/jni/SSLContext.java         |   61 +-
 java/org/apache/tomcat/jni/SSLExt.java             |  159 ---
 java/org/apache/tomcat/jni/SSLSocket.java          |    6 +
 java/org/apache/tomcat/jni/Shm.java                |    7 +-
 java/org/apache/tomcat/jni/Socket.java             |   70 +-
 java/org/apache/tomcat/jni/Status.java             |    2 +-
 java/org/apache/tomcat/jni/Stdlib.java             |    6 +
 java/org/apache/tomcat/jni/Thread.java             |    2 +-
 java/org/apache/tomcat/jni/Time.java               |   12 +-
 java/org/apache/tomcat/jni/User.java               |    8 +
 java/org/apache/tomcat/jni/socket/AprSocket.java   |  922 -------------
 .../apache/tomcat/jni/socket/AprSocketContext.java | 1352 --------------------
 java/org/apache/tomcat/jni/socket/HostInfo.java    |   84 --
 jnirelease.sh                                      |    2 +-
 native/NMAKEmakefile                               |    2 +-
 native/build/api.pl                                |  367 ++++++
 native/build/tcnative.m4                           |    9 +-
 native/configure                                   |   10 +-
 native/include/ssl_private.h                       |   28 +
 native/include/tcn_version.h                       |    2 +-
 native/os/win32/libtcnative.rc                     |    6 +-
 native/src/lock.c                                  |   11 -
 native/src/ssl.c                                   |  239 +++-
 native/src/sslcontext.c                            |  412 +++++-
 native/src/sslinfo.c                               |   32 +-
 native/src/sslnetwork.c                            |  215 ++--
 native/src/sslutils.c                              |  231 +---
 native/srclib/VERSIONS                             |    2 +-
 native/srclib/apr/NMAKEmakefile                    |   19 +-
 native/srclib/openssl/openssl-msvcrt.patch         |   10 +-
 native/tcnative.spec                               |    2 +-
 xdocs/index.xml                                    |   13 +-
 xdocs/miscellaneous/changelog.xml                  |  110 ++
 xdocs/miscellaneous/project.xml                    |    1 +
 xdocs/news/2015.xml                                |   19 +-
 xdocs/news/{2015.xml => 2016.xml}                  |   26 +-
 xdocs/news/project.xml                             |    1 +
 xdocs/project.xml                                  |    1 +
 xdocs/style.xsl                                    |    2 +-
 73 files changed, 1865 insertions(+), 3145 deletions(-)

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