This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new d5dbac61e Fix version set in DLL header on Windows
d5dbac61e is described below
commit d5dbac61e4357ea5c5c2a434b85bafd0321e065b
Author: Michael Osipov <[email protected]>
AuthorDate: Thu Oct 12 17:12:19 2023 +0200
Fix version set in DLL header on Windows
---
native/NMAKEmakefile | 4 ++--
xdocs/miscellaneous/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index 1c91b5c47..ad02d3152 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -69,7 +69,7 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
!ENDIF
-LFLAGS = $(LFLAGS) /version:1.1
+LFLAGS = $(LFLAGS) /version:1.2
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib
ole32.lib
LFLAGS = $(LFLAGS) $(APR_LIB)
!IF DEFINED(WITH_FIPS)
@@ -78,7 +78,7 @@ LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib
ssleay32.lib /NODEFAULTLI
!IF DEFINED(OPENSSL_NEW_LIBS)
LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib
!ELSE
-LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
!ENDIF
!ENDIF
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index a80514dbf..5e3f2ae8f 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -38,6 +38,9 @@
<update>
Align Java source compile configuration with Tomcat. (michaelo)
</update>
+ <fix>
+ Fix version set in DLL header on Windows. (michaelo)
+ </fix>
</changelog>
</section>
<section name="Changes in 1.2.39">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
