svn commit: r1806176 - /tomcat/native/trunk/native/src/sslconf.c

[markt]

Author: markt
Date: Fri Aug 25 14:58:55 2017
New Revision: 1806176

URL: http://svn.apache.org/viewvc?rev=1806176&view=rev
Log:
Windows compiler seems to want earlier definition

Modified:
tomcat/native/trunk/native/src/sslconf.c

Modified: tomcat/native/trunk/native/src/sslconf.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslconf.c?rev=1806176&r1=1806175&r2=1806176&view=diff
==
--- tomcat/native/trunk/native/src/sslconf.c (original)
+++ tomcat/native/trunk/native/src/sslconf.c Fri Aug 25 14:58:55 2017
@@ -144,6 +144,7 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, check)
 {
 tcn_ssl_conf_ctxt_t *c = J2P(cctx, tcn_ssl_conf_ctxt_t *);
 int rc = 1;
+int value_type;
 unsigned long ec;
 TCN_ALLOC_CSTRING(cmd);
 TCN_ALLOC_CSTRING(value);
@@ -156,7 +157,7 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, check)
 }
 
 SSL_ERR_clear();
-int value_type = SSL_CONF_cmd_value_type(c->cctx, J2S(cmd));
+value_type = SSL_CONF_cmd_value_type(c->cctx, J2S(cmd));
 ec = SSL_ERR_get();
 if (ec != 0) {
 char err[256];



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1806178 - /tomcat/native/trunk/native/srclib/apr/NMAKEmakefile

[markt]

Author: markt
Date: Fri Aug 25 15:03:42 2017
New Revision: 1806178

URL: http://svn.apache.org/viewvc?rev=1806178&view=rev
Log:
Additional file required for APR 1.6.x

Modified:
tomcat/native/trunk/native/srclib/apr/NMAKEmakefile

Modified: tomcat/native/trunk/native/srclib/apr/NMAKEmakefile
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/apr/NMAKEmakefile?rev=1806178&r1=1806177&r2=1806178&view=diff
==
--- tomcat/native/trunk/native/srclib/apr/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/srclib/apr/NMAKEmakefile Fri Aug 25 15:03:42 2017
@@ -99,6 +99,7 @@ OBJECTS = \
$(WORKDIR)\poll.obj \
$(WORKDIR)\pollcb.obj \
$(WORKDIR)\pollset.obj \
+   $(WORKDIR)\wakeup.obj \
$(WORKDIR)\select.obj \
$(WORKDIR)\apr_random.obj \
$(WORKDIR)\sha2.obj \



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1806180 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Fri Aug 25 15:05:24 2017
New Revision: 1806180

URL: http://svn.apache.org/viewvc?rev=1806180&view=rev
Log:
Add version updates

Modified:
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1806180&r1=1806179&r2=1806180&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Aug 25 15:05:24 
2017
@@ -71,6 +71,12 @@
   the libtool specified by APR by setting the LIBTOOL
   environment variable. (markt)
 
+
+  Update build to use APR 1.6.x, with 1.6.2 recommended. (markt)
+
+
+  Update recommended OpenSSL version to 1.0.2l. (markt)
+
   
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1806181 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_13/

[markt]

Author: markt
Date: Fri Aug 25 15:12:33 2017
New Revision: 1806181

URL: http://svn.apache.org/viewvc?rev=1806181&view=rev
Log:
Need to re-tag

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_2_13/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1806183 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_13: ./ build.properties.default native/include/tcn_version.h

[markt]

Author: markt
Date: Fri Aug 25 15:14:39 2017
New Revision: 1806183

URL: http://svn.apache.org/viewvc?rev=1806183&view=rev
Log:
Tag 1.2.13

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_13/
  - copied from r1806182, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_13/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_13/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_13/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_13/build.properties.default?rev=1806183&r1=1806182&r2=1806183&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_13/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_13/build.properties.default Fri Aug 25 
15:14:39 2017
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=13
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_13/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_13/native/include/tcn_version.h?rev=1806183&r1=1806182&r2=1806183&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_13/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_13/native/include/tcn_version.h Fri 
Aug 25 15:14:39 2017
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r21300 - in /dev/tomcat/tomcat-connectors/native/1.2.13: ./ binaries/ source/

[markt]

Author: markt
Date: Fri Aug 25 16:21:49 2017
New Revision: 21300

Log:
Upload Tomcat Native 1.2.13 for voting

Added:
dev/tomcat/tomcat-connectors/native/1.2.13/
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-win32-bin.zip.sha1
dev/tomcat/tomcat-connectors/native/1.2.13/source/

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-src.tar.gz
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-src.tar.gz.asc

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-src.tar.gz.md5

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-src.tar.gz.sha1

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-win32-src.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-win32-src.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.13/source/tomcat-native-1.2.13-win32-src.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.asc
 Fri Aug 25 16:21:49 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABAgAGBQJZoEqmAAoJEBDAHFovYFnnfy8P/jRkBAAd8HbqfSLVar9bqbUN
+EbsQiC9r5hMiR7+ez4y31kKSlRg7lz57+kRtWpdcTAU0SM6p4rIQjN0M8gK/qjAH
+ELDGFe9AglFyGsL7/ACshdSL6cBrf0sIclwaeB1V83pR70K4sOWy7FQ3uYKd6cTz
+opWShK+tjMzcu5jb9HOw7rRoSRPEXXPB5DR5a/paPHLuZaUmr7ry0cnRsQzx4/EE
+NCiqv5tEMZshBrmOBDzZQQn8DFrQBdGfUn6IUfa+FhhmqDiC0PV8I00oaMHdnAkA
+kubAcL/9I1dLxrpy7d+C017ghSy8n/HSPgtycVj0wev0ZbNQiOqQPN/LG2v6AXgX
+9BP8o9maHLJydK2TRKAnuvfQur+b5vPQbXZmCaLK2Chvs3FlacDD102aQjIl5NLK
+wvS37jrxglKAsO1r1yan5wDf8K+qS00omzB1UIrBgcsQQ3bUjKj0emumwPTLB1OV
+vwCwZrgv1NfzDqKKMJWGQVvpgHbU0AS3Y7J1oUlfxmxk5iQs9Ph441Epli8Tf12C
+ZQsip+oHqh/rD8X7WnrCD1r4NajvGSaub9hi5gfwPcZ895OBDcIUN7hQKlV186NN
+O3ZmsdRnZKzsmSFX6co8ML7y8qj56alJ4leltbXyKlBdevFyRrFYUqhUdscfcrkB
+PHhndXDykrvqQDPLLVzp
+=/7tL
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.md5
 Fri Aug 25 16:21:49 2017
@@ -0,0 +1 @@
+febbdd60a55a7a622efb41786312b05f *tomcat-native-1.2.13-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-ocsp-win32-bin.zip.sha1
 Fri Aug 25 16:21:49 2017
@@ -0,0 +1 @@
+bf460ae0c6ac47ebffe16927ceb90dd892a82c7a 
*tomcat-native-1.2.13-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.13/binaries/tomcat-native-1.2.13-win32-bin.zip
==

[VOTE] Release Apache Tomcat Native 1.2.13

[Mark Thomas]

Version 1.2.13 includes the following changes compared to 1.2.12:

- Update minimum recommended OpenSSL version to 1.0.2l
- Update minimum recommended APR version to 1.6.2
- Windows binaries built with OpenSSL 1.0.2l and APR 1.6.2
- Support for the SSL_CONF_cmd API

Various other fixes and improvements. See the changelog for details.

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.13 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.13/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_13

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.2.13

[Rainer Jung]

Am 25.08.2017 um 18:24 schrieb Mark Thomas:

Version 1.2.13 includes the following changes compared to 1.2.12:

- Update minimum recommended OpenSSL version to 1.0.2l
- Update minimum recommended APR version to 1.6.2
- Windows binaries built with OpenSSL 1.0.2l and APR 1.6.2
- Support for the SSL_CONF_cmd API

Various other fixes and improvements. See the changelog for details.

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.13 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...


Partial result: although tests in general look good until now, I found 
one unit test specific problem on Linux using the APR connector and 
OpenSSL 1.0.2.


The new test TestDefaultServletEncoding in TC 9 head executes many test 
cases. All of them use the same Tomcat child process, but each test case 
runs org.apache.catalina.core.AprLifecycleListener.initializeSSL() which 
goes down to the native initialize() in native/src/ssl.c. There we 
create a thread local using apr_threadkey_private_create() which in turn 
calls pthread_key_create(). That pthread API is limited to creating not 
more than PTHREAD_KEYS_MAX keys. On typical linux systems this limit is 
1024, but the test runs initializeSSL() for about 2600 times. the first 
1024 succeed, the remaining ones throw an exception in initializeSSL() 
with errno EAGAIN (which is expected when getting above the limit).


On Solaris the limit is 128 but the problem does not occur. When using 
OpenSSL 1.1.0 and above, that part of the native code doesn't run and 
the problem also does not show up, the same for Windows. And for JSSE 
connectors with OpenSSL impl the AprLifecycleListener only calls 
initializeSSL() in the SSL related tests, so not for 
TestDefaultServletEncoding in contrast to the APR connector.


I'd expect the initializeSSL() call for real TC and other tcnative using 
apps is only called once or at least not extremely often, so that should 
not be a problem outside of our unit tests. Still it would be nice if we 
could add a cleanup using apr_threadkey_private_delete() somewhere. 
Unfortunately in order to be able to call a cleanup from TC code, e.g. 
the AprLifecycleListener, we would need an API extension in tcnative first.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org