Hello community, here is the log from the commit of package libtcnative-1-0 for openSUSE:Factory checked in at 2012-12-10 10:10:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtcnative-1-0 (Old) and /work/SRC/openSUSE:Factory/.libtcnative-1-0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libtcnative-1-0", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libtcnative-1-0/libtcnative-1-0.changes 2012-03-29 07:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtcnative-1-0.new/libtcnative-1-0.changes 2012-12-10 10:10:41.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 6 13:48:00 UTC 2012 - [email protected] + +- update to 1.1.24 + * add support for per-socket timeouts inside poller + +------------------------------------------------------------------- Old: ---- tomcat-native-1.1.23-src.tar.gz New: ---- tomcat-native-1.1.24-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.GZUBlB/_old 2012-12-10 10:10:42.000000000 +0100 +++ /var/tmp/diff_new_pack.GZUBlB/_new 2012-12-10 10:10:42.000000000 +0100 @@ -17,12 +17,12 @@ Name: libtcnative-1-0 -Version: 1.1.23 +Version: 1.1.24 Release: 0 Summary: JNI wrappers for Apache Portable Runtime for Tomcat License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Url: http://tomcat.apache.org/tomcat-6.0-doc/apr.html +Url: https://tomcat.apache.org/tomcat-7.0-doc/apr.html Source0: tomcat-native-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ tomcat-native-1.1.23-src.tar.gz -> tomcat-native-1.1.24-src.tar.gz ++++++ ++++ 7240 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/CHANGELOG.txt new/tomcat-native-1.1.24-src/CHANGELOG.txt --- old/tomcat-native-1.1.23-src/CHANGELOG.txt 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/CHANGELOG.txt 2012-06-11 14:21:27.000000000 +0200 @@ -1,102 +1,156 @@ - Apache TomcatApache Logo - -------------------------------------------------------------------------- - The Apache Tomcat Native - Miscellaneous Documentation - - Preface - This is the Changelog for Tomcat Native. This changelog does not - contain all updates and fixes to the Tomcat Native (yet). It should - contain fixes made only after December 19th 2007, when the new - documentation project for Tomcat Native was started. - - Changes between 1.1.22 and 1.1.23 - update 45392: Add support for OCSP verification. Based upon a patch - from Aristotelis. (mturk) - fix 52119: Autodetect Diablo JDK on FreeBSD and Java7+. Based upon a - patch from Michael Osipov. (mturk) - fix 52717: Set scope_id for IPv6 addresses if provided. (mturk) - update 50570: Allow explicit use of FIPS mode in APR lifecycle listener - (native support only in this update; Java support to follow). - Based upon a patch from Chris Beckey. (schultz) - - Changes between 1.1.21 and 1.1.22 - fix Arrange release packaging script. (jfclere). - fix Fix typos in the changelog. (markt). - - Changes between 1.1.20 and 1.1.21 (not released) - fix 50394: InternalAprInputBuffer.fill() doesn't deal correctly with - EOF. (jfclere) - fix Support arbitrary protocol combinations of SSLv2, SSLv3 and - TLSv1. (rjung) - fix 51437: Try loading certificate in DER format if PEM was invalid. - (mturk) - fix 49557: index error in the loop to get the env info in the - proc.create function. (kkolinko, jfclere) - fix 49851: JNI Registry.deleteKey and Registry.deleteValue corrupt - Windows registry. (jfclere) - fix 48253: adding dynamic locking callbacks for openssl engines. - (jfclere) - update Make the non blocking write really no blocking. (jfclere) - update Add support for unsafe legacy renegotiation. (mturk) - - Changes between 1.1.19 and 1.1.20 - fix 48584: Prevent crashing JVM on shutdown. (mturk) - - Changes between 1.1.18 and 1.1.19 - fix Update windows resource files to correct version. (mturk) - fix 48129: Fix build with OpenSSL 1.0.0-beta3. Patch provided by - Tomas Mraz. (mturk, rjung) - update Add detection of the Mac OS X JVM. (rjung) - - Changes between 1.1.17 and 1.1.18 - fix Fix CVE-2009-3555 SSL-Man-In-The-Middle attack. (mturk) - - Changes between 1.1.16 and 1.1.17 - update Arrange build after svn reorganisation (rjung) - fix 47852: Fix some Javadoc errors. Patch provided by Sebb. (rjung) - fix 46950: Fix SSL renegotiation in combination with client - certificates. The complete solution also needs a fix in Tomcat's - Java code. (markt) - fix Align method names and signatures of native C code and java - code. (markt, rjung) - fix 42728: Remove memory leak. (markt) - fix 46457: Fix use of multicast. (markt) - fix Fix API name for recvfrom (mturk) - fix Allow building against APR 1.3 (mturk) - fix Improve fix for 43327 with better handling for IPv6 addresses - (markt) - - Changes between 1.1.15 and 1.1.16 - fix Fix API name for recvfrom (mturk) - fix Allow building against APR 1.3 (mturk) - fix Improve fix for 43327 with better handling for IPv6 addresses - (markt) - - Changes between 1.1.14 and 1.1.15 - fix 43327: Socket bind fail because mixing IPv4/IPv6 (markt, jfclere) - fix 44864: Use additional check for SSL verify like with mod_ssl for - SSLVerifyClient=optionalNoCA. (mturk) - - Changes between 1.1.13 and 1.1.14 - fix 45071: Reset ttl when Poll.pool remove is false. Additional patch - was provided by Alex Barclay. (mturk) - fix Fix optGet that was always throwing exceptions. (jfclere) - fix Fix optSet don't throw exception as JAVA prototype doesn't. - (jfclere) - - Changes between 1.1.12 and 1.1.13 - fix IFS problem in native/build/tcnative.m4 (rjung) - fix Wrong gcc link flag in native/build/tcnative.m4 (rjung) - - Changes between 1.1.11 and 1.1.12 - update Add support of J9VM based JVM. (jfclere) - update Arrange licence in source files. (markt) - update Add two new 'immediate' methods for sending the data. It is the - responsibility of the Java callee to deal with the returned - values and retry if the error was non-fatal. (mturk) - fix Arrange the check of openssl version. It was failing on Linux. - (jfclere) - fix Prevent returning APR_SUCCESS when there is something wrong in - ssl layer. (jfclere) - fix 44087: Fix it. (jfclere) - -------------------------------------------------------------------------- +Apache TomcatApache Logo + +------------------------------------------------------------------------------- + +The Apache Tomcat Native - Miscellaneous Documentation * + +Preface + This is the Changelog for Tomcat Native. This changelog + does not contain all updates and fixes to the Tomcat + Native (yet). It should contain fixes made only after + December 19th 2007, when the new documentation project for + Tomcat Native was started. + +Changes between 1.1.23 and 1.1.24 + update Add support for per-socket timeouts inside poller. + (markt, mturk) + +Changes between 1.1.22 and 1.1.23 + update 45392: Add support for OCSP verification. Based + upon a patch from Aristotelis. (mturk) + + fix 52119: Autodetect Diablo JDK on FreeBSD and Java7+. + Based upon a patch from Michael Osipov. (mturk) + + fix 52717: Set scope_id for IPv6 addresses if provided. + (mturk) + + update 50570: Allow explicit use of FIPS mode in APR + lifecycle listener (native support only in this + update; Java support to follow). Based upon a patch + from Chris Beckey. (schultz) + +Changes between 1.1.21 and 1.1.22 + fix Arrange release packaging script. (jfclere). + + fix Fix typos in the changelog. (markt). + +Changes between 1.1.20 and 1.1.21 (not released) + fix 50394: InternalAprInputBuffer.fill() doesn't deal + correctly with EOF. (jfclere) + + fix Support arbitrary protocol combinations of SSLv2, + SSLv3 and TLSv1. (rjung) + + fix 51437: Try loading certificate in DER format if PEM + was invalid. (mturk) + + fix 49557: index error in the loop to get the env info + in the proc.create function. (kkolinko, jfclere) + + fix 49851: JNI Registry.deleteKey and + Registry.deleteValue corrupt Windows registry. + (jfclere) + + fix 48253: adding dynamic locking callbacks for openssl + engines. (jfclere) + + update Make the non blocking write really no blocking. + (jfclere) + + update Add support for unsafe legacy renegotiation. + (mturk) + +Changes between 1.1.19 and 1.1.20 + fix 48584: Prevent crashing JVM on shutdown. (mturk) + +Changes between 1.1.18 and 1.1.19 + fix Update windows resource files to correct version. + (mturk) + + fix 48129: Fix build with OpenSSL 1.0.0-beta3. Patch + provided by Tomas Mraz. (mturk, rjung) + + update Add detection of the Mac OS X JVM. (rjung) + +Changes between 1.1.17 and 1.1.18 + fix Fix CVE-2009-3555 SSL-Man-In-The-Middle attack. + (mturk) + +Changes between 1.1.16 and 1.1.17 + update Arrange build after svn reorganisation (rjung) + + fix 47852: Fix some Javadoc errors. Patch provided by + Sebb. (rjung) + + fix 46950: Fix SSL renegotiation in combination with + client certificates. The complete solution also + needs a fix in Tomcat's Java code. (markt) + + fix Align method names and signatures of native C code + and java code. (markt, rjung) + + fix 42728: Remove memory leak. (markt) + + fix 46457: Fix use of multicast. (markt) + + fix Fix API name for recvfrom (mturk) + + fix Allow building against APR 1.3 (mturk) + + fix Improve fix for 43327 with better handling for IPv6 + addresses (markt) + +Changes between 1.1.15 and 1.1.16 + fix Fix API name for recvfrom (mturk) + + fix Allow building against APR 1.3 (mturk) + + fix Improve fix for 43327 with better handling for IPv6 + addresses (markt) + +Changes between 1.1.14 and 1.1.15 + fix 43327: Socket bind fail because mixing IPv4/IPv6 + (markt, jfclere) + + fix 44864: Use additional check for SSL verify like with + mod_ssl for SSLVerifyClient=optionalNoCA. (mturk) + +Changes between 1.1.13 and 1.1.14 + fix 45071: Reset ttl when Poll.pool remove is false. + Additional patch was provided by Alex Barclay. (mturk) + + fix Fix optGet that was always throwing exceptions. + (jfclere) + + fix Fix optSet don't throw exception as JAVA prototype + doesn't. (jfclere) + +Changes between 1.1.12 and 1.1.13 + fix IFS problem in native/build/tcnative.m4 (rjung) + + fix Wrong gcc link flag in native/build/tcnative.m4 + (rjung) + +Changes between 1.1.11 and 1.1.12 + update Add support of J9VM based JVM. (jfclere) + + update Arrange licence in source files. (markt) + + update Add two new 'immediate' methods for sending the + data. It is the responsibility of the Java callee + to deal with the returned values and retry if the + error was non-fatal. (mturk) + + fix Arrange the check of openssl version. It was + failing on Linux. (jfclere) + + fix Prevent returning APR_SUCCESS when there is + something wrong in ssl layer. (jfclere) + + fix 44087: Fix it. (jfclere) + +------------------------------------------------------------------------------- + Copyright � 2008-2012, Apache Software Foundation + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/build.properties.default new/tomcat-native-1.1.24-src/jni/build.properties.default --- old/tomcat-native-1.1.23-src/jni/build.properties.default 2009-09-17 00:24:43.000000000 +0200 +++ new/tomcat-native-1.1.24-src/jni/build.properties.default 2012-06-11 14:13:04.000000000 +0200 @@ -18,9 +18,9 @@ # ----- Version Control Flags ----- version.major=1 version.minor=1 -version.build=17 +version.build=24 version.patch=0 -version.suffix=-dev +version.suffix= # ----- Default Base Path for Dependent Packages ----- # Please note this path must be absolute, not relative, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/index.html new/tomcat-native-1.1.24-src/jni/docs/index.html --- old/tomcat-native-1.1.23-src/jni/docs/index.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/index.html 2012-06-11 14:21:27.000000000 +0200 @@ -13,13 +13,13 @@ <br> <ul> -<li><a href="news/2011.html#20110808.1">08 August 2011 - <b>TC-Native-1.1.22 released</b></a> -<p>The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.22 Stable. +<li><a href="news/2012.html#20120302.1">02 March 2012 - <b>TC-Native-1.1.23 released</b></a> +<p>The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. </p> -<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz";>TC-native 1.1.22 release sources</a> - | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz.asc";>PGP signature</a> +<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz";>TC-native 1.1.23 release sources</a> + | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP signature</a> </p> -<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/binaries/";>binaries</a> for selected platforms. +<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/";>binaries</a> for selected platforms. </p> </li> </ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/miscellaneous/changelog.html new/tomcat-native-1.1.24-src/jni/docs/miscellaneous/changelog.html --- old/tomcat-native-1.1.23-src/jni/docs/miscellaneous/changelog.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/miscellaneous/changelog.html 2012-06-11 14:21:27.000000000 +0200 @@ -1,4 +1,4 @@ -<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>The Apache Tomcat Native - Miscellaneous Documentation - </title><meta name="author" value="Jean-Frederic Clere"><meta name="email" value="[email protected]"><link href="../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/";><img src="../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/";><img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--LEFT SIDE NAVIGATION--><td width="20%" valign="top" nowrap="true"><p><strong>Links</strong></p><ul><li><a href="../index.html">Docs Home</a></li></ul><p><strong>Miscellaneous Documentation</strong></p><ul><li><a href="../miscellaneous/changelog.html">Changelog</a></li></ul><p><strong>News</strong></p><ul><li><a href="../news/2008.html">2008</a></li><li><a href="../news/2009.html">2009</a></li><li><a href="../news/2010.html">2010</a></li></ul></td><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Native - Miscellaneous Documentation</h1><h2></h2></td><td align="right" valign="top" nowrap="true"><small><a href="printer/changelog.html"><img src="../images/printer.gif" border="0" alt="Printer Friendly Version"><br>print-friendly<br>version +<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>The Apache Tomcat Native - Miscellaneous Documentation - </title><meta name="author" value="Jean-Frederic Clere"><meta name="email" value="[email protected]"><link href="../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/";><img src="../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/";><img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--LEFT SIDE NAVIGATION--><td width="20%" valign="top" nowrap="true"><p><strong>Links</strong></p><ul><li><a href="../index.html">Docs Home</a></li></ul><p><strong>Miscellaneous Documentation</strong></p><ul><li><a href="../miscellaneous/changelog.html">Changelog</a></li></ul><p><strong>News</strong></p><ul><li><a href="../news/2008.html">2008</a></li><li><a href="../news/2009.html">2009</a></li><li><a href="../news/2010.html">2010</a></li><li><a href="../news/2011.html">2011</a></li><li><a href="../news/2012.html">2012</a></li></ul></td><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Native - Miscellaneous Documentation</h1><h2></h2></td><td align="right" valign="top" nowrap="true"><small><a href="printer/changelog.html"><img src="../images/printer.gif" border="0" alt="Printer Friendly Version"><br>print-friendly<br>version </a></small></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Preface"><strong>Preface</strong></a></font></td></tr><tr><td><blockquote> <p> This is the Changelog for Tomcat Native. This changelog @@ -6,6 +6,12 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. </p> +</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.1.23 and 1.1.24"><strong>Changes between 1.1.23 and 1.1.24</strong></a></font></td></tr><tr><td><blockquote> + <table border="0" cellpadding="2" cellspacing="2"> + <tr><td valign="top"><img alt="update" class="icon" src="../images/update.gif"></td><td> + Add support for per-socket timeouts inside poller. (markt, mturk) + </td></tr> + </table> </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.1.22 and 1.1.23"><strong>Changes between 1.1.22 and 1.1.23</strong></a></font></td></tr><tr><td><blockquote> <table border="0" cellpadding="2" cellspacing="2"> <tr><td valign="top"><img alt="update" class="icon" src="../images/update.gif"></td><td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/miscellaneous/printer/changelog.html new/tomcat-native-1.1.24-src/jni/docs/miscellaneous/printer/changelog.html --- old/tomcat-native-1.1.23-src/jni/docs/miscellaneous/printer/changelog.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/miscellaneous/printer/changelog.html 2012-06-11 14:21:27.000000000 +0200 @@ -5,6 +5,12 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. </p> +</blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.1.23 and 1.1.24"><strong>Changes between 1.1.23 and 1.1.24</strong></a></font></td></tr><tr><td><blockquote> + <table border="0" cellpadding="2" cellspacing="2"> + <tr><td valign="top"><img alt="update" class="icon" src="../../images/update.gif"></td><td> + Add support for per-socket timeouts inside poller. (markt, mturk) + </td></tr> + </table> </blockquote></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="Changes between 1.1.22 and 1.1.23"><strong>Changes between 1.1.22 and 1.1.23</strong></a></font></td></tr><tr><td><blockquote> <table border="0" cellpadding="2" cellspacing="2"> <tr><td valign="top"><img alt="update" class="icon" src="../../images/update.gif"></td><td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/news/2012.html new/tomcat-native-1.1.24-src/jni/docs/news/2012.html --- old/tomcat-native-1.1.23-src/jni/docs/news/2012.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/news/2012.html 2012-06-11 14:21:27.000000000 +0200 @@ -1,6 +1,21 @@ <html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>The Apache Tomcat Native - News - 2012 News and Status</title><meta name="author" value="Apache Tomcat Native Project"><meta name="email" value="general.AT.tomcat.DOT.apache.DOT.org"><link href="../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/";><img src="../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/";><img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--LEFT SIDE NAVIGATION--><td width="20%" valign="top" nowrap="true"><p><strong>Links</strong></p><ul><li><a href="../index.html">Docs Home</a></li></ul><p><strong>Miscellaneous Documentation</strong></p><ul><li><a href="../miscellaneous/changelog.html">Changelog</a></li></ul><p><strong>News</strong></p><ul><li><a href="../news/2008.html">2008</a></li><li><a href="../news/2009.html">2009</a></li><li><a href="../news/2010.html">2010</a></li><li><a href="../news/2011.html">2011</a></li><li><a href="../news/2012.html">2012</a></li></ul></td><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Native - News</h1><h2>2012 News and Status</h2></td><td align="right" valign="top" nowrap="true"><small><a href="printer/2012.html"><img src="../images/printer.gif" border="0" alt="Printer Friendly Version"><br>print-friendly<br>version </a></small></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="2012 News & Status"><strong>2012 News & Status</strong></a></font></td></tr><tr><td><blockquote> <br> +<a name="20120302.1"> +<h3>08 August - TC-Native-1.1.23 released</h3> +</a> +<p>The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and +experimental support for OCSP and PKCS12 certificates. +</p> +<br> +<p> + Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes. +</p> +<p>If you find any bugs while using this release, please fill in the +<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla</a> +Bug Report. When entering bug select <b>Native:JNI</b> Component. +</p> <hr size="1" noshade> </blockquote></td></tr></table></td></tr><!--FOOTER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><!--PAGE FOOTER--><tr><td colspan="2"><div align="center"><font color="#525D76" size="-1"><em> Copyright © 2008-2012, Apache Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/news/printer/2012.html new/tomcat-native-1.1.24-src/jni/docs/news/printer/2012.html --- old/tomcat-native-1.1.23-src/jni/docs/news/printer/2012.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/news/printer/2012.html 2012-06-11 14:21:27.000000000 +0200 @@ -1,5 +1,20 @@ <html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>The Apache Tomcat Native - News - 2012 News and Status</title><meta name="author" value="Apache Tomcat Native Project"><meta name="email" value="general.AT.tomcat.DOT.apache.DOT.org"><link href="../../style.css" type="text/css" rel="stylesheet"></head><body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76"><table border="0" width="100%" cellspacing="4"><!--PAGE HEADER--><tr><td colspan="2"><!--TOMCAT LOGO--><a href="http://tomcat.apache.org/";><img src="../../images/tomcat.gif" align="left" alt="Apache Tomcat" border="0"></a><!--APACHE LOGO--><a href="http://www.apache.org/";><img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"></a></td></tr><!--HEADER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><tr><!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left"><table border="0" width="100%" cellspacing="4"><tr><td align="left" valign="top"><h1>The Apache Tomcat Native - News</h1><h2>2012 News and Status</h2></td><td align="right" valign="top" nowrap="true"><img src="../../images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"></td></tr></table><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><a name="2012 News & Status"><strong>2012 News & Status</strong></a></font></td></tr><tr><td><blockquote> <br> +<a name="20120302.1"> +<h3>08 August - TC-Native-1.1.23 released</h3> +</a> +<p>The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and +experimental support for OCSP and PKCS12 certificates. +</p> +<br> +<p> + Please see the <a href="../../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes. +</p> +<p>If you find any bugs while using this release, please fill in the +<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>Bugzilla</a> +Bug Report. When entering bug select <b>Native:JNI</b> Component. +</p> <hr size="1" noshade> </blockquote></td></tr></table></td></tr><!--FOOTER SEPARATOR--><tr><td colspan="2"><hr noshade size="1"></td></tr><!--PAGE FOOTER--><tr><td colspan="2"><div align="center"><font color="#525D76" size="-1"><em> Copyright © 2008-2012, Apache Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/docs/printer/index.html new/tomcat-native-1.1.24-src/jni/docs/printer/index.html --- old/tomcat-native-1.1.23-src/jni/docs/printer/index.html 2012-02-28 15:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/docs/printer/index.html 2012-06-11 14:21:26.000000000 +0200 @@ -12,13 +12,13 @@ <br> <ul> -<li><a href="../news/2011.html#20110808.1">08 August 2011 - <b>TC-Native-1.1.22 released</b></a> -<p>The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.22 Stable. +<li><a href="../news/2012.html#20120302.1">02 March 2012 - <b>TC-Native-1.1.23 released</b></a> +<p>The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.23 Stable. </p> -<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz";>TC-native 1.1.22 release sources</a> - | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz.asc";>PGP signature</a> +<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz";>TC-native 1.1.23 release sources</a> + | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc";>PGP signature</a> </p> -<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/binaries/";>binaries</a> for selected platforms. +<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/";>binaries</a> for selected platforms. </p> </li> </ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/include/tcn.h new/tomcat-native-1.1.24-src/jni/native/include/tcn.h --- old/tomcat-native-1.1.23-src/jni/native/include/tcn.h 2012-02-24 10:26:28.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/include/tcn.h 2012-05-24 17:28:13.000000000 +0200 @@ -17,7 +17,7 @@ /* * * @author Mladen Turk - * @version $Revision: 1293144 $, $Date: 2012-02-24 10:26:28 +0100 (Fri, 24 Feb 2012) $ + * @version $Revision: 1342298 $, $Date: 2012-05-24 17:28:13 +0200 (Thu, 24 May 2012) $ */ #ifndef TCN_H @@ -152,6 +152,8 @@ char *jsbbuff; char *jrbbuff; tcn_nlayer_t *net; + apr_time_t last_active; + apr_interval_time_t timeout; } tcn_socket_t; /* Private helper functions */ @@ -284,4 +286,6 @@ else if (F == 1) T = SOCK_DGRAM; \ else T = F +#define TCN_NO_SOCKET_TIMEOUT -2 + #endif /* TCN_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/include/tcn_version.h new/tomcat-native-1.1.24-src/jni/native/include/tcn_version.h --- old/tomcat-native-1.1.23-src/jni/native/include/tcn_version.h 2012-02-23 09:45:32.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/include/tcn_version.h 2012-06-11 14:13:04.000000000 +0200 @@ -17,7 +17,7 @@ /* * * @author Mladen Turk - * @version $Revision: 1292706 $, $Date: 2012-02-23 09:45:32 +0100 (Thu, 23 Feb 2012) $ + * @version $Revision: 1348811 $, $Date: 2012-06-11 14:13:04 +0200 (Mon, 11 Jun 2012) $ */ #ifndef TCN_VERSION_H @@ -69,7 +69,7 @@ #define TCN_MINOR_VERSION 1 /** patch level */ -#define TCN_PATCH_VERSION 23 +#define TCN_PATCH_VERSION 24 /** * This symbol is defined for internal, "development" copies of TCN. This diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/os/win32/libtcnative.rc new/tomcat-native-1.1.24-src/jni/native/os/win32/libtcnative.rc --- old/tomcat-native-1.1.23-src/jni/native/os/win32/libtcnative.rc 2012-02-23 09:45:32.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/os/win32/libtcnative.rc 2012-05-22 12:40:39.000000000 +0200 @@ -20,7 +20,7 @@ "See the License for the specific language governing " \ "permissions and limitations under the License." -#define TCN_VERSION "1.1.23" +#define TCN_VERSION "1.1.24" 1000 ICON "apache.ico" 1001 DIALOGEX 0, 0, 252, 51 @@ -36,8 +36,8 @@ END 1 VERSIONINFO - FILEVERSION 1,1,23,0 - PRODUCTVERSION 1,1,23,0 + FILEVERSION 1,1,24,0 + PRODUCTVERSION 1,1,24,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/src/poll.c new/tomcat-native-1.1.24-src/jni/native/src/poll.c --- old/tomcat-native-1.1.23-src/jni/native/src/poll.c 2008-09-08 12:19:13.000000000 +0200 +++ new/tomcat-native-1.1.24-src/jni/native/src/poll.c 2012-05-29 10:56:31.000000000 +0200 @@ -17,7 +17,7 @@ /* * * @author Mladen Turk - * @version $Revision: 693044 $, $Date: 2008-09-08 12:19:13 +0200 (Mon, 08 Sep 2008) $ + * @version $Revision: 1343605 $, $Date: 2012-05-29 10:56:31 +0200 (Tue, 29 May 2012) $ */ #include "tcn.h" @@ -40,8 +40,7 @@ apr_pollset_t *pollset; jlong *set; apr_pollfd_t *socket_set; - apr_interval_time_t *socket_ttl; - apr_interval_time_t max_ttl; + apr_interval_time_t default_timeout; #ifdef TCN_DO_STATISTICS int sp_added; int sp_max_count; @@ -99,7 +98,7 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(TCN_STDARGS, jint size, jlong pool, jint flags, - jlong ttl) + jlong default_timeout) { apr_pool_t *p = J2P(pool, apr_pool_t *); apr_pollset_t *pollset = NULL; @@ -128,12 +127,10 @@ TCN_CHECK_ALLOCATED(tps->set); tps->socket_set = apr_palloc(p, size * sizeof(apr_pollfd_t)); TCN_CHECK_ALLOCATED(tps->socket_set); - tps->socket_ttl = apr_palloc(p, size * sizeof(apr_interval_time_t)); - TCN_CHECK_ALLOCATED(tps->socket_ttl); tps->nelts = 0; tps->nalloc = size; tps->pool = p; - tps->max_ttl = J2T(ttl); + tps->default_timeout = J2T(default_timeout); #ifdef TCN_DO_STATISTICS sp_created++; apr_pool_cleanup_register(p, (const void *)tps, @@ -158,15 +155,12 @@ return (jint)apr_pollset_destroy(p->pollset); } -TCN_IMPLEMENT_CALL(jint, Poll, add)(TCN_STDARGS, jlong pollset, - jlong socket, jint reqevents) -{ - tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *); - tcn_socket_t *s = J2P(socket, tcn_socket_t *); - apr_pollfd_t fd; +static apr_status_t do_add(tcn_pollset_t *p, tcn_socket_t *s, + apr_int16_t reqevents, + apr_interval_time_t socket_timeout) { - UNREFERENCED_STDARGS; - TCN_ASSERT(socket != 0); + apr_interval_time_t timeout = socket_timeout; + apr_pollfd_t fd; if (p->nelts == p->nalloc) { #ifdef TCN_DO_STATISTICS @@ -174,15 +168,20 @@ #endif return APR_ENOMEM; } + if (timeout == TCN_NO_SOCKET_TIMEOUT) { + timeout = p->default_timeout; + } + if (timeout > 0) + s->last_active = apr_time_now(); + else + s->last_active = 0; + s->timeout = socket_timeout; + memset(&fd, 0, sizeof(apr_pollfd_t)); fd.desc_type = APR_POLL_SOCKET; - fd.reqevents = (apr_int16_t)reqevents; + fd.reqevents = reqevents; fd.desc.s = s->sock; fd.client_data = s; - if (p->max_ttl > 0) - p->socket_ttl[p->nelts] = apr_time_now(); - else - p->socket_ttl[p->nelts] = 0; p->socket_set[p->nelts] = fd; p->nelts++; @@ -193,6 +192,31 @@ return (jint)apr_pollset_add(p->pollset, &fd); } +TCN_IMPLEMENT_CALL(jint, Poll, add)(TCN_STDARGS, jlong pollset, + jlong socket, jint reqevents) +{ + tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *); + tcn_socket_t *s = J2P(socket, tcn_socket_t *); + + UNREFERENCED_STDARGS; + TCN_ASSERT(socket != 0); + + return (jint) do_add(p, s, (apr_int16_t)reqevents, TCN_NO_SOCKET_TIMEOUT); +} + +TCN_IMPLEMENT_CALL(jint, Poll, addWithTimeout)(TCN_STDARGS, jlong pollset, + jlong socket, jint reqevents, + jlong socket_timeout) +{ + tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *); + tcn_socket_t *s = J2P(socket, tcn_socket_t *); + + UNREFERENCED_STDARGS; + TCN_ASSERT(socket != 0); + + return (jint) do_add(p, s, (apr_int16_t)reqevents, J2T(socket_timeout)); +} + static apr_status_t do_remove(tcn_pollset_t *p, const apr_pollfd_t *fd) { apr_int32_t i; @@ -202,11 +226,13 @@ /* Found an instance of the fd: remove this and any other copies */ apr_int32_t dst = i; apr_int32_t old_nelts = p->nelts; + tcn_socket_t *ds = (tcn_socket_t *)p->socket_set[dst].client_data; p->nelts--; #ifdef TCN_DO_STATISTICS p->sp_removed++; #endif for (i++; i < old_nelts; i++) { + tcn_socket_t *ss = (tcn_socket_t *)p->socket_set[i].client_data; if (fd->desc.s == p->socket_set[i].desc.s) { #ifdef TCN_DO_STATISTICS p->sp_equals++; @@ -215,8 +241,9 @@ } else { p->socket_set[dst] = p->socket_set[i]; - p->socket_ttl[dst] = p->socket_ttl[i]; - dst++; + ds->last_active = ss->last_active; + ds->timeout = ss->timeout; + ds = (tcn_socket_t *)p->socket_set[++dst].client_data; } } break; @@ -225,14 +252,15 @@ return apr_pollset_remove(p->pollset, fd); } -static void update_ttl(tcn_pollset_t *p, const apr_pollfd_t *fd, apr_time_t t) +static void update_last_active(tcn_pollset_t *p, const apr_pollfd_t *fd, apr_time_t t) { apr_int32_t i; for (i = 0; i < p->nelts; i++) { if (fd->desc.s == p->socket_set[i].desc.s) { - /* Found an instance of the fd: update ttl */ - p->socket_ttl[i] = t; + tcn_socket_t *s = (tcn_socket_t *)p->socket_set[i].client_data; + /* Found an instance of the fd: update last active time */ + s->last_active = t; break; } } @@ -290,18 +318,28 @@ p->sp_poll++; #endif - if (ptime > 0 && p->max_ttl >= 0) { + if (ptime > 0) { now = apr_time_now(); /* Find the minimum timeout */ for (i = 0; i < p->nelts; i++) { - apr_interval_time_t t = now - p->socket_ttl[i]; - if (t >= p->max_ttl) { - ptime = 0; - break; + apr_interval_time_t socket_timeout = 0; + tcn_socket_t *s = (tcn_socket_t *)p->socket_set[i].client_data; + if (s->timeout == TCN_NO_SOCKET_TIMEOUT) { + socket_timeout = p->default_timeout; } else { - ptime = TCN_MIN(p->max_ttl - t, ptime); + socket_timeout = s->timeout; + } + if (socket_timeout >= 0) { + apr_interval_time_t t = now - s->last_active; + if (t >= socket_timeout) { + ptime = 0; + break; + } + else { + ptime = TCN_MIN(socket_timeout - t, ptime); + } } } } @@ -340,7 +378,7 @@ if (remove) do_remove(p, fd); else - update_ttl(p, fd, now); + update_last_active(p, fd, now); fd ++; } (*e)->SetLongArrayRegion(e, set, 0, num * 2, p->set); @@ -361,38 +399,33 @@ TCN_ASSERT(pollset != 0); /* Check for timeout sockets */ - if (p->max_ttl > 0) { - for (i = 0; i < p->nelts; i++) { - if ((now - p->socket_ttl[i]) >= p->max_ttl) { - fd = p->socket_set[i]; - p->set[num++] = P2J(fd.client_data); - } + for (i = 0; i < p->nelts; i++) { + apr_interval_time_t timeout = 0; + tcn_socket_t *s = (tcn_socket_t *)p->socket_set[i].client_data; + if (s->timeout == TCN_NO_SOCKET_TIMEOUT) { + timeout = p->default_timeout; } - if (remove && num) { - memset(&fd, 0, sizeof(apr_pollfd_t)); -#ifdef TCN_DO_STATISTICS - p->sp_maintained += num; - p->sp_max_maintained = TCN_MAX(p->sp_max_maintained, num); -#endif - for (i = 0; i < num; i++) { - fd.desc_type = APR_POLL_SOCKET; - fd.reqevents = APR_POLLIN | APR_POLLOUT; - fd.desc.s = (J2P(p->set[i], tcn_socket_t *))->sock; - do_remove(p, &fd); - } + else { + timeout = s->timeout; } - } - else if (p->max_ttl == 0) { - for (i = 0; i < p->nelts; i++) { - fd = p->socket_set[i]; - p->set[num++] = P2J(fd.client_data); + if (timeout == -1) { + continue; } - if (remove) { - remove_all(p); + if ((now - s->last_active) >= timeout) { + p->set[num++] = P2J(s); + } + } + if (remove && num) { + memset(&fd, 0, sizeof(apr_pollfd_t)); #ifdef TCN_DO_STATISTICS - p->sp_maintained += num; - p->sp_max_maintained = TCN_MAX(p->sp_max_maintained, num); + p->sp_maintained += num; + p->sp_max_maintained = TCN_MAX(p->sp_max_maintained, num); #endif + for (i = 0; i < num; i++) { + fd.desc_type = APR_POLL_SOCKET; + fd.reqevents = APR_POLLIN | APR_POLLOUT; + fd.desc.s = (J2P(p->set[i], tcn_socket_t *))->sock; + do_remove(p, &fd); } } if (num) @@ -401,18 +434,18 @@ } TCN_IMPLEMENT_CALL(void, Poll, setTtl)(TCN_STDARGS, jlong pollset, - jlong ttl) + jlong default_timeout) { tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *); UNREFERENCED_STDARGS; - p->max_ttl = J2T(ttl); + p->default_timeout = J2T(default_timeout); } TCN_IMPLEMENT_CALL(jlong, Poll, getTtl)(TCN_STDARGS, jlong pollset) { tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *); UNREFERENCED_STDARGS; - return (jlong)p->max_ttl; + return (jlong)p->default_timeout; } TCN_IMPLEMENT_CALL(jint, Poll, pollset)(TCN_STDARGS, jlong pollset, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/src/ssl.c new/tomcat-native-1.1.24-src/jni/native/src/ssl.c --- old/tomcat-native-1.1.23-src/jni/native/src/ssl.c 2012-02-27 17:49:54.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/src/ssl.c 2012-05-29 11:05:40.000000000 +0200 @@ -17,7 +17,7 @@ /* * * @author Mladen Turk - * @version $Revision: 1294214 $, $Date: 2012-02-27 17:49:54 +0100 (Mon, 27 Feb 2012) $ + * @version $Revision: 1343611 $, $Date: 2012-05-29 11:05:40 +0200 (Tue, 29 May 2012) $ */ #include "tcn.h" @@ -288,13 +288,13 @@ static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line) { - apr_status_t rv; + if (mode & CRYPTO_LOCK) { - rv = apr_thread_mutex_lock(l->mutex); + apr_thread_mutex_lock(l->mutex); } else { - rv = apr_thread_mutex_unlock(l->mutex); + apr_thread_mutex_unlock(l->mutex); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/src/sslinfo.c new/tomcat-native-1.1.24-src/jni/native/src/sslinfo.c --- old/tomcat-native-1.1.23-src/jni/native/src/sslinfo.c 2009-12-15 10:44:38.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/src/sslinfo.c 2012-05-29 11:12:04.000000000 +0200 @@ -17,7 +17,7 @@ /** SSL info wrapper * * @author Mladen Turk - * @version $Revision: 890719 $, $Date: 2009-12-15 10:44:38 +0100 (Tue, 15 Dec 2009) $ + * @version $Revision: 1343613 $, $Date: 2012-05-29 11:12:04 +0200 (Tue, 29 May 2012) $ */ #include "tcn.h" @@ -318,10 +318,10 @@ break; case SSL_INFO_CIPHER_DESCRIPTION: { - const SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); + SSL_CIPHER *cipher = (SSL_CIPHER *)SSL_get_current_cipher(s->ssl); if (cipher) { char buf[256]; - char *desc = SSL_CIPHER_description(cipher, buf, 256); + const char *desc = SSL_CIPHER_description(cipher, buf, 256); value = tcn_new_string(e, desc); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/srclib/VERSIONS new/tomcat-native-1.1.24-src/jni/native/srclib/VERSIONS --- old/tomcat-native-1.1.23-src/jni/native/srclib/VERSIONS 2012-02-23 13:05:10.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/srclib/VERSIONS 2012-06-11 12:27:13.000000000 +0200 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.4.6, http://apr.apache.org -- OpenSSL 1.0.0g, http://www.openssl.org +- OpenSSL 1.0.1c, http://www.openssl.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/srclib/openssl/openssl-msvcrt.patch new/tomcat-native-1.1.24-src/jni/native/srclib/openssl/openssl-msvcrt.patch --- old/tomcat-native-1.1.23-src/jni/native/srclib/openssl/openssl-msvcrt.patch 2012-02-23 15:31:58.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/srclib/openssl/openssl-msvcrt.patch 2012-06-11 11:56:31.000000000 +0200 @@ -1,24 +1,24 @@ --- util/pl/VC-32.pl +++ util/pl/VC-32.pl -@@ -33,7 +33,7 @@ +@@ -43,7 +43,7 @@ # considered safe to ignore. # $base_cflags= " $mf_cflag"; -- my $f = $shlib?' /MD':' /MT'; +- my $f = $shlib || $fips ?' /MD':' /MT'; + my $f = ' /MD'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; -@@ -114,7 +114,7 @@ +@@ -124,7 +124,7 @@ else # Win32 { $base_cflags= " $mf_cflag"; -- my $f = $shlib?' /MD':' /MT'; +- my $f = $shlib || $fips ?' /MD':' /MT'; + my $f = ' /MD'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox /O2 /Ob2'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; -@@ -165,6 +165,7 @@ +@@ -175,6 +175,7 @@ { $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib'; $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tomcat-native-1.1.23-src/jni/native/tcnative.spec new/tomcat-native-1.1.24-src/jni/native/tcnative.spec --- old/tomcat-native-1.1.23-src/jni/native/tcnative.spec 2012-02-28 15:05:15.000000000 +0100 +++ new/tomcat-native-1.1.24-src/jni/native/tcnative.spec 2012-06-11 14:21:37.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Tomcat Native Java library Name: tcnative -Version: 1.1.23 +Version: 1.1.24 Release: 1 License: Apache Software License Group: System Environment/Libraries -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
![http://www.apache.org/images/asf-logo.gif"](http://www.apache.org/images/asf-logo.gif"){kind=link}