2008-05-22 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.Configuration_2.0 / GlobalizationSection.cs

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
index ba0606463f726de21240dccc9040dbba7a282d79..5116d2abd7d503d804562498e487503dedd338c4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
@@ -209,7 +209,7 @@ namespace System.Web.Configuration {
                                auto = true;
                                if (culture.Length > 5 && culture[4] == ':')
                                        return new CultureInfo (culture.Substring (5));
-                               return new CultureInfo (0x007f);
+                               return CultureInfo.InvariantCulture;// (0x007f);
                        }
 
                        return new CultureInfo (culture);
@@ -245,13 +245,14 @@ namespace System.Web.Configuration {
 
                Encoding GetEncoding (ConfigurationProperty prop, ref string cached_encoding_name)
                {
+                       string enc = (string) base [prop];
                        if (cached_encoding_name == null)
-                               cached_encoding_name = "utf-8";
+                               cached_encoding_name = ((enc == null) ? "utf-8" : enc);
 
                        Encoding encoding = (Encoding)encodingHash [prop];
                        if (encoding == null || encoding.EncodingName != cached_encoding_name) {
                                try {
-                                       switch (cached_encoding_name.ToLower ()) {
+                                       switch (cached_encoding_name.ToLower (CultureInfo.InvariantCulture)) {
                                        case "utf-16le":
                                        case "utf-16":
                                        case "ucs-2":