From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 6 Jul 2008 19:31:20 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d85195d07b25f50e9d5a86c8fa139871f95f00a4;p=tomcat7.0

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 c0fae761e..cde187d88 100644
--- 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 6842b3b1e..c69283ece 100644
--- 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