This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 2a05b839b636dd94b7af6c31ac556eef12d5e610 Author: Mark Thomas <[email protected]> AuthorDate: Mon Dec 1 16:37:53 2025 +0000 Build Windows binaries with OCSP support enabled by default. --- native/BUILDING | 6 +----- native/NMAKEmakefile | 4 ++-- xdocs/miscellaneous/changelog.xml | 6 ++++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/native/BUILDING b/native/BUILDING index c622cf94e..46ff6d84c 100644 --- a/native/BUILDING +++ b/native/BUILDING @@ -165,16 +165,12 @@ Windows >set JAVA_HOME=C:\java\21.0.7-tem > "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - > nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-%APR_VER% WITH_OPENSSL=C:\deps-x86\openssl-%OPENSSL_VER% CPU=X86 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 ENABLE_OCSP=1 - > move WIN7_X86_DLL_RELEASE WIN7_X86_OCSP_DLL_RELEASE > nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-%APR_VER% WITH_OPENSSL=C:\deps-x86\openssl-%OPENSSL_VER% CPU=X86 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 > "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - > nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-%APR_VER% WITH_OPENSSL=C:\deps-x64\openssl-%OPENSSL_VER% CPU=X64 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 ENABLE_OCSP=1 - > move WIN7_X64_DLL_RELEASE WIN7_X64_OCSP_DLL_RELEASE > nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-%APR_VER% WITH_OPENSSL=C:\deps-x64\openssl-%OPENSSL_VER% CPU=X64 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1 - Tomcat Native Connector DLLs may then be found in native\WIN7_*_[OCSP_]DLL_RELEASE + Tomcat Native Connector DLLs may then be found in native\WIN7_*_DLL_RELEASE FIPS diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile index 011cbb06a..d1a848b53 100644 --- a/native/NMAKEmakefile +++ b/native/NMAKEmakefile @@ -18,7 +18,7 @@ # NMAKEmakefile Tomcat Native makefile. # Usage: # APR_DECLARE_STATIC=1 Use static version of the APR -# ENABLE_OCSP=1 Enable OpenSSL OCSP code +# DISABLE_OCSP=1 Disable OpenSSL OCSP code # OPENSSL_NEW_LIBS=1 Use new OpenSSL lib file names # DEBUG=1 Build DEBUG version of TCN # STATIC_CRT=Hybrid Build using the 'Hybrid CRT' technique @@ -43,7 +43,7 @@ APR_LIB = libapr-1.lib CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC APR_LIB = apr-1.lib !ENDIF -!IF !DEFINED(ENABLE_OCSP) +!IF DEFINED(DISABLE_OCSP) CFLAGS = $(CFLAGS) -DOPENSSL_NO_OCSP !ENDIF diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 90507b16d..3e0aebf77 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -32,6 +32,12 @@ </p> </section> <section name="Changes in 2.0.10"> + <changelog> + <update> + The Windows binaries are now built with OCSP support enabled by default. + (markt) + </update> + </changelog> </section> <section name="Changes in 2.0.9"> <changelog> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
