| commit | a3797401a4deec6a3db8b4c22181d8df1df6d91f | [log] [tgz] |
|---|---|---|
| author | Mark Thomas <markt@apache.org> | Mon Jun 20 09:10:04 2016 +0000 |
| committer | Mark Thomas <markt@apache.org> | Mon Jun 20 09:10:04 2016 +0000 |
| tree | e0dd3a3b050791d4850989a4a89147419085ff0b | |
| parent | 9418edda0710ca7670ae5b3ef00a2fea55aed4f6 [diff] |
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59616 Correctly enable and disable OCSP for the Windows builds. git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/trunk@1749280 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile index 70fe234..c22d97c 100644 --- a/native/NMAKEmakefile +++ b/native/NMAKEmakefile
@@ -41,8 +41,8 @@ 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)" == ""
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 8c2b5cc..f067da6 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml
@@ -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">