This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 6cd19267d OpenSSL 4 compatibility
6cd19267d is described below
commit 6cd19267d9a0b25e8a85c301fd97f116b64eae3d
Author: Rainer Jung <[email protected]>
AuthorDate: Sun Jun 21 10:49:46 2026 +0200
OpenSSL 4 compatibility
Remove call to ERR_remove_thread_state() from Windows specific code to
allow building with OpenSSL 4.0.x. ERR_remove_thread_state() is a no-op
in OpenSSL 1.1+ and got removed in OpenSSL 4. (rjung)
---
native/os/win32/system.c | 2 +-
xdocs/miscellaneous/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/native/os/win32/system.c b/native/os/win32/system.c
index 0f7377f8c..a7774da8b 100644
--- a/native/os/win32/system.c
+++ b/native/os/win32/system.c
@@ -53,6 +53,7 @@ DllMain(
InitializeCriticalSection(&dll_critical_section);
dll_instance = instance;
break;
+
/** The attached process creates a new thread.
*/
case DLL_THREAD_ATTACH:
@@ -61,7 +62,6 @@ DllMain(
/** The thread of the attached process terminates.
*/
case DLL_THREAD_DETACH:
- ERR_remove_thread_state(NULL);
break;
/** DLL unload due to process termination
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 3931dac31..24596eef7 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,13 @@
</p>
</section>
<section name="2.0.16" rtext="developement in progress">
+ <changelog>
+ <scode>
+ Remove call to ERR_remove_thread_state() from Windows specific code to
+ allow building with OpenSSL 4.0.x. ERR_remove_thread_state() is a no-op
+ in OpenSSL 1.1+ and got removed in OpenSSL 4. (rjung)
+ </scode>
+ </changelog>
</section>
<section name="2.0.15" rtext="2026-06-15">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
