Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332

Specify the correct encoding (the current windows code page) rather than assuming UTF-8 when creating tomcat-users.xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@674335 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/confinstall/tomcat-users_1.xml b/res/confinstall/tomcat-users_1.xml
index c0fae76..cde187d 100644 (file)
--- a/res/confinstall/tomcat-users_1.xml
+++ b/res/confinstall/tomcat-users_1.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0' encoding='utf-8'?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 6842b3b..c69283e 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -541,6 +541,9 @@ Silent:
   
   Delete "$INSTDIR\conf\tomcat-users.xml"
   FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
+  ; File will be written using current windows codepage
+  System::Call 'Kernel32::GetACP() i .r18'
+  FileWrite $R9 "<?xml version='1.0' encoding='cp$R8'?>$\r$\n"
 
   Push "$TEMP\confinstall\tomcat-users_1.xml"
   Call copyFile