tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r698613 - /tomcat/trunk/res/tomcat.nsi
Date Wed, 24 Sep 2008 15:47:40 GMT
Author: markt
Date: Wed Sep 24 08:47:40 2008
New Revision: 698613

URL: http://svn.apache.org/viewvc?rev=698613&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852
Add special handling a for charset that Java uses a non-default name for

Modified:
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=698613&r1=698612&r2=698613&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Wed Sep 24 08:47:40 2008
@@ -535,8 +535,11 @@
   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"
-
+  StrCmp $R8 "932" 0 +3
+    ; Special case where Java uses non-standard name for character set
+    FileWrite $R9 "<?xml version='1.0' encoding='ms$R8'?>$\r$\n"
+    Goto +2
+    FileWrite $R9 "<?xml version='1.0' encoding='cp$R8'?>$\r$\n"
   Push "$TEMP\confinstall\tomcat-users_1.xml"
   Call copyFile
   FileWrite $R9 $R5



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


Mime
View raw message