Author: markt
Date: Mon Jun 20 09:10:04 2016
New Revision: 1749280
URL: http://svn.apache.org/viewvc?rev=1749280&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59616
Correctly enable and disable OCSP for the Windows builds.
Modified:
tomcat/native/trunk/native/NMAKEmakefile
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/NMAKEmakefile
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/NMAKEmakefile?rev=1749280&r1=1749279&r2=1749280&view=diff
==============================================================================
--- tomcat/native/trunk/native/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/NMAKEmakefile Mon Jun 20 09:10:04 2016
@@ -41,8 +41,8 @@ APR_LIB = libapr-1.lib
CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC
APR_LIB = apr-1.lib
!ENDIF
-!IF DEFINED(ENABLE_OCSP)
-CFLAGS = $(CFLAGS) -DHAVE_OPENSSL_OCSP
+!IF !DEFINED(ENABLE_OCSP)
+CFLAGS = $(CFLAGS) -DOPENSSL_NO_OCSP
!ENDIF
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1749280&r1=1749279&r2=1749280&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Jun 20 09:10:04
2016
@@ -36,6 +36,10 @@
</section>
<section name="Changes in 1.2.8">
<changelog>
+ <fix>
+ <bug>59616</bug>: Correct the Windows build files so that OCSP is
+ correctly enabled and disabled in the respective Windows binaries.
(markt)
+ </fix>
</changelog>
</section>
<section name="Changes in 1.2.7">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
