This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new eda74b19e Apache: Only export the main module symbol.
eda74b19e is described below
commit eda74b19e4800e3ed8bb3351d8995d1b3eb44a4d
Author: Rainer Jung <[email protected]>
AuthorDate: Tue Sep 5 12:12:42 2023 +0200
Apache: Only export the main module symbol.
Visibility of module internal symbols led to crashes when
conflicting with library symbols.
Based on a patch provided by Josef Čejka. (rjung)
Fixes BZ 66005.
---
native/apache-2.0/Makefile.apxs.in | 5 +++--
native/apache-2.0/Makefile.in | 4 +++-
xdocs/miscellaneous/changelog.xml | 5 +++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/native/apache-2.0/Makefile.apxs.in
b/native/apache-2.0/Makefile.apxs.in
index 907c82874..36aeada1c 100644
--- a/native/apache-2.0/Makefile.apxs.in
+++ b/native/apache-2.0/Makefile.apxs.in
@@ -19,8 +19,9 @@ srcdir=@srcdir@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
APXS=@APXS@
-APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
+APXSLDFLAGS=@APXSLDFLAGS@
+JKLDFLAGS=-export-symbols-regex ^jk_module$
COMMON=common
JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
@@ -32,7 +33,7 @@ include @top_builddir@/common/list.mk
all: mod_jk.la
mod_jk.la:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS}
${srcdir}/mod_jk.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS}
${JKLDFLAGS} ${srcdir}/mod_jk.c ${APACHE_OBJECTS}
install: mod_jk.la
$(APXS) -i mod_jk.la
diff --git a/native/apache-2.0/Makefile.in b/native/apache-2.0/Makefile.in
index d5fab1bde..e63f5c921 100644
--- a/native/apache-2.0/Makefile.in
+++ b/native/apache-2.0/Makefile.in
@@ -23,6 +23,8 @@ MKDIR=@MKDIR@
APXSCFLAGS=@APXSCFLAGS@
APXSCPPFLAGS=@APXSCPPFLAGS@
APXSLDFLAGS=@APXSLDFLAGS@
+JKLDFLAGS=-export-symbols-regexp ^jk_module$
+
CC=@CC@
SHELL=@SHELL@
@@ -80,7 +82,7 @@ mod_jk.lo: ${srcdir}/mod_jk.c
${LT_COMPILE}
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
- $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath
${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) ${JKLDFLAGS} -o $@
-module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
mod_jk.so: mod_jk.la
${top_srcdir}/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)'
mod_jk.la `pwd`
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 4d103383d..86a637ed8 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -84,6 +84,11 @@
body to httpd when the status code represents an error if the request
used
the HEAD method. (markt)
</fix>
+ <fix>
+ Apache: <bug>66005</bug>: Only export the main module symbol. Visibility
+ of module internal symbols led to crashes when conflicting with library
+ symbols. Based on a patch provided by Josef Čejka. (rjung)
+ </fix>
</changelog>
</section>
<section name="Changes between 1.2.47 and 1.2.48">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
