Author: rjung
Date: Thu Feb  4 23:05:22 2016
New Revision: 1728566

URL: http://svn.apache.org/viewvc?rev=1728566&view=rev
Log:
Enable OpenSSL version check in "configure" by
default. It can be turned off using
--disable-openssl-version-check.

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=1728566&r1=1728565&r2=1728566&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Thu Feb  4 23:05:22 2016
@@ -234,8 +234,8 @@ case "$use_openssl" in
         LIBS="$LIBS $TCN_OPENSSL_LIBS"
 
 AC_ARG_ENABLE(openssl-version-check,
-[AC_HELP_STRING([--enable-openssl-version-check],
-        [Check OpenSSL Version @<:@default=yes@:>@])])
+[AC_HELP_STRING([--disable-openssl-version-check],
+        [disable the OpenSSL version check])])
 case "$enable_openssl_version_check" in
 yes|'')
         AC_MSG_CHECKING(OpenSSL library version >= 1.0.2)

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1728566&r1=1728565&r2=1728566&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Thu Feb  4 23:05:22 
2016
@@ -36,6 +36,11 @@
 </section>
 <section name="Changes in 1.2.5">
   <changelog>
+    <update>
+      Enable OpenSSL version check in <code>configure</code> by
+      default. It can be turned off using
+      <code>--disable-openssl-version-check</code>. (rjung)
+    </update>
   </changelog>
 </section>
 <section name="Changes in 1.2.4">
@@ -73,7 +78,7 @@
     </add>
     <scode>
       Remove code that performs a read after a renegotiation that appears to be
-      unnecessary with OpenSDSL 1.0.2. (billbarker)
+      unnecessary with OpenSSL 1.0.2. (billbarker)
     </scode>
     <add>
       Expose <code>SSL_renegotiate</code> to the Java API. (remm)



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

Reply via email to