Author: rjung
Date: Mon Mar 21 20:06:16 2016
New Revision: 1736080
URL: http://svn.apache.org/viewvc?rev=1736080&view=rev
Log:
Change the OpenSSL version check in
"configure" to be fatal.
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=1736080&r1=1736079&r2=1736080&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Mar 21 20:06:16 2016
@@ -155,7 +155,6 @@ dnl Configure for the detected openssl t
dnl preference to "--with-ssl=<path>" if it was specified.
dnl
AC_DEFUN(TCN_CHECK_SSL_TOOLKIT,[
-OPENSSL_WARNING=
AC_MSG_CHECKING(for OpenSSL library)
AC_ARG_WITH(ssl,
[ --with-ssl[=PATH] Build with OpenSSL [yes|no|path]],
@@ -252,9 +251,7 @@ int main() {
}
],
[AC_MSG_RESULT(ok)],
- [AC_MSG_RESULT(not compatible)
- OPENSSL_WARNING=yes
- ],
+ [AC_MSG_ERROR(Your version of OpenSSL is not compatible with this
version of tcnative)],
[AC_MSG_RESULT(assuming target platform has compatible version)])
;;
no)
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1736080&r1=1736079&r2=1736080&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Mar 21 20:06:16
2016
@@ -37,6 +37,10 @@
<section name="Changes in 1.2.6">
<changelog>
<update>
+ Change the OpenSSL version check in <code>configure</code>
+ to be fatal. (rjung)
+ </update>
+ <update>
Use new OpenSSL 1.1.0 protocol version max and min API
when creating a new SSL context. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
