[tomcat-native] 01/05: Merge tag 'upstream/1.1.32_repack'

[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 43731292c8655c2b9ba2d89c2dbd6737ce110d38
Merge: e65f3b9 2fa92ee
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 22:39:45 2014 +0100

    Merge tag 'upstream/1.1.32_repack'

 CHANGELOG.txt                                      |   7 ++
 jni/build.properties.default                       |   2 +-
 jni/docs/index.html                                |   4 +-
 jni/docs/miscellaneous/changelog.html              |  13 +++
 jni/docs/news/2008.html                            |   2 +-
 jni/docs/news/2009.html                            |   2 +-
 jni/docs/news/2010.html                            |   2 +-
 jni/docs/news/2011.html                            |   2 +-
 jni/docs/news/2012.html                            |   2 +-
 jni/docs/news/2013.html                            |   2 +-
 jni/docs/news/2014.html                            |  10 +-
 jni/java/org/apache/tomcat/jni/Buffer.java         |   4 +-
 jni/java/org/apache/tomcat/jni/File.java           |  22 ++--
 jni/java/org/apache/tomcat/jni/Global.java         |   2 +-
 jni/java/org/apache/tomcat/jni/Lock.java           |   4 +-
 jni/java/org/apache/tomcat/jni/Multicast.java      |   2 +-
 jni/java/org/apache/tomcat/jni/Poll.java           |  12 +--
 jni/java/org/apache/tomcat/jni/Pool.java           |   2 +-
 jni/java/org/apache/tomcat/jni/Procattr.java       |  10 +-
 jni/java/org/apache/tomcat/jni/SSL.java            |  24 ++++-
 jni/java/org/apache/tomcat/jni/SSLContext.java     |  48 +++++----
 jni/java/org/apache/tomcat/jni/SSLSocket.java      |   6 +-
 jni/java/org/apache/tomcat/jni/Shm.java            |  10 +-
 jni/java/org/apache/tomcat/jni/Socket.java         |   8 +-
 jni/java/org/apache/tomcat/jni/Status.java         |   2 +-
 jni/java/org/apache/tomcat/jni/Stdlib.java         |   4 +-
 jni/java/org/apache/tomcat/jni/Time.java           |   2 +-
 .../apache/tomcat/jni/socket/AprSocketContext.java | 117 +++++++++++----------
 jni/native/build/._apr_common.m4                   | Bin 177 -> 0 bytes
 jni/native/build/._config.guess                    | Bin 177 -> 0 bytes
 jni/native/build/._config.sub                      | Bin 177 -> 0 bytes
 jni/native/build/._find_apr.m4                     | Bin 177 -> 0 bytes
 jni/native/build/._install.sh                      | Bin 177 -> 0 bytes
 jni/native/include/ssl_private.h                   |   6 +-
 jni/native/include/tcn_version.h                   |   4 +-
 jni/native/os/win32/libtcnative.rc                 |   6 +-
 jni/native/src/ssl.c                               |  10 +-
 jni/native/src/sslcontext.c                        | 103 +++++++++++-------
 jni/native/srclib/VERSIONS                         |   4 +-
 jni/native/tcnative.spec                           |   2 +-
 jni/xdocs/index.xml                                |   4 +-
 jni/xdocs/miscellaneous/changelog.xml              |  14 +++
 jni/xdocs/news/2008.xml                            |   1 -
 jni/xdocs/news/2009.xml                            |   1 -
 jni/xdocs/news/2010.xml                            |   1 -
 jni/xdocs/news/2011.xml                            |   1 -
 jni/xdocs/news/2012.xml                            |   1 -
 jni/xdocs/news/2013.xml                            |   1 -
 jni/xdocs/news/2014.xml                            |   9 +-
 49 files changed, 297 insertions(+), 198 deletions(-)

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