tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r674335 - in /tomcat/trunk/res: confinstall/tomcat-users_1.xml tomcat.nsi
Date Sun, 06 Jul 2008 19:31:21 GMT
Author: markt
Date: Sun Jul  6 12:31:20 2008
New Revision: 674335

URL: http://svn.apache.org/viewvc?rev=674335&view=rev
Log:
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

Modified:
    tomcat/trunk/res/confinstall/tomcat-users_1.xml
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/confinstall/tomcat-users_1.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/tomcat-users_1.xml?rev=674335&r1=674334&r2=674335&view=diff
==============================================================================
--- tomcat/trunk/res/confinstall/tomcat-users_1.xml (original)
+++ tomcat/trunk/res/confinstall/tomcat-users_1.xml Sun Jul  6 12:31:20 2008
@@ -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

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=674335&r1=674334&r2=674335&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Jul  6 12:31:20 2008
@@ -541,6 +541,9 @@
   
   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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message