You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/11/04 07:33:56 UTC
svn commit: r1712476 - in /tomcat/native/trunk: native/src/ssl.c
xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Wed Nov 4 06:33:56 2015
New Revision: 1712476
URL: http://svn.apache.org/viewvc?rev=1712476&view=rev
Log:
Fix "error: 'ctx' undeclared" in maintainer mode
or when DEBUG is defined.
Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/ssl.c
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1712476&r1=1712475&r2=1712476&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Nov 4 06:33:56 2015
@@ -1549,7 +1549,11 @@ TCN_IMPLEMENT_CALL(void, SSL, setVerify)
verify = SSL_VERIFY_NONE;
UNREFERENCED(o);
- TCN_ASSERT(ctx != 0);
+
+ if (c == NULL) {
+ tcn_ThrowException(e, "context is null");
+ return;
+ }
c->verify_mode = level;
if (c->verify_mode == SSL_CVERIFY_UNSET)
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1712476&r1=1712475&r2=1712476&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Nov 4 06:33:56 2015
@@ -34,6 +34,13 @@
This is the Changelog for Tomcat Native 1.2.
</p>
</section>
+<section name="Changes in 1.2.2">
+ <changelog>
+ <fix>
+ Fix broken debug and maintainer mode build. (rjung)
+ </fix>
+ </changelog>
+</section>
<section name="Changes in 1.2.1">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org