Author: rjung
Date: Mon Nov 9 17:45:08 2015
New Revision: 1713487
URL: http://svn.apache.org/viewvc?rev=1713487&view=rev
Log:
Fix the signature of the implementation of the
native SSL method newSSL() in the case when
OPENSSL is not available.
Use the same signature in the case when
HAVE_OPENSSL is not defined as in the case
when it 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=1713487&r1=1713486&r2=1713487&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Mon Nov 9 17:45:08 2015
@@ -1861,9 +1861,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, getLastErr
return 0;
}
-TCN_IMPLEMENT_CALL(jlong, SSL, newSSL)(TCN_STDARGS, jlong ssl_ctx) {
+TCN_IMPLEMENT_CALL(jlong /* SSL * */, SSL, newSSL)(TCN_STDARGS,
+ jlong ctx /* tcn_ssl_ctxt_t
* */,
+ jboolean server) {
UNREFERENCED(o);
- UNREFERENCED(ssl_ctx);
+ UNREFERENCED(ctx);
+ UNREFERENCED(server);
tcn_ThrowException(e, "Not implemented");
return 0;
}
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1713487&r1=1713486&r2=1713487&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Nov 9 17:45:08
2015
@@ -46,6 +46,10 @@
Fix typo in declaration of a stub method used when the library is
compiled without OpenSSL support. (kkolinko)
</fix>
+ <fix>
+ Fix the signature of the implementation of the native SSL method
+ newSSL() in the case when OPENSSL is not available. (rjung)
+ </fix>
</changelog>
</section>
<section name="Changes in 1.2.2">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
