This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit a4aa2f812e594c0ce1002bc7ad10cadfc10a9107
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Oct 21 20:14:50 2026 +0100

    Generate HTML changelog as UTF-8
    
    Fixes issue with copyright symbol
---
 jnirelease.sh                     | 8 ++++----
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index 9cd04a0cd..b01382fa0 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -91,9 +91,9 @@ if [ "x$JKJNIEXT" = "x" ]; then
 fi
 
 # Check for links, elinks or w3m
-w3m_opts="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
-elinks_opts="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering 
-no-references -no-home"
-links_opts="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
+w3m_opts="-dump -cols 80 -t 4 -S -O utf-8 -T text/html"
+elinks_opts="-dump -dump-width 80 -dump-charset utf-8 -no-numbering 
-no-references -no-home"
+links_opts="-dump -width 80 -codepage utf-8 -no-g -html-numbered-links 0"
 EXPTOOL=""
 EXPOPTS=""
 for i in w3m elinks links
@@ -244,7 +244,7 @@ if [ $? -ne 0 ]; then
 fi
 # Remove page navigation data from converted file.
 cp -p ../CHANGELOG.txt ../CHANGELOG.txt.tmp
-awk '/Preface/ {o=1} o>0' ../CHANGELOG.txt.tmp > ../CHANGELOG.txt
+LC_ALL=C.UTF-8 awk '/Preface/ {o=1} o>0' ../CHANGELOG.txt.tmp > 
../CHANGELOG.txt
 rm ../CHANGELOG.txt.tmp
 
 cd "$top"
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 4e3962e91..bcd61a3e5 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -52,6 +52,9 @@
     <update>
       Update the recommended minimum version of OpenSSL to 3.5.9. (markt)
     </update>
+    <fix>
+      Generate the HTML changelog as UTF-8. (markt)
+    </fix>
   </changelog>
 </section>
 <section name="1.3.9" rtext="2026-09-07">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to