diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-08 23:11:30 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-08 23:11:30 +0400 |
| commit | f6e391bb49c7943460f9b8026cfc4d7311fbcfbc (patch) | |
| tree | 6753e0e9e0b6cac5973d462887ab866698a1493c | |
| parent | 2d8eb21f63f9e7873315b51e4ecab538695c4d83 (diff) | |
2010-04-08 Gonzalo Paniagua Javier <gonzalo@novell.com>
* GlobalizationSection.cs: use WebName instead of EncodingName.
svn path=/branches/mono-2-6/mcs/; revision=155081
| -rw-r--r-- | mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog index 27183e9ec5c..f4b9d1d7ddc 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog @@ -1,3 +1,7 @@ +2010-04-08 Gonzalo Paniagua Javier <gonzalo@novell.com> + + * GlobalizationSection.cs: use WebName instead of EncodingName. + 2010-02-12 Marek Habersack <mhabersack@novell.com> * WebConfigurationHost.cs: implemented {Encrypt,Decrypt}Section 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 3025cf5d371..6472d06698a 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs @@ -135,13 +135,13 @@ namespace System.Web.Configuration { [ConfigurationProperty ("fileEncoding")] public Encoding FileEncoding { get { return GetEncoding (fileEncodingProp, ref cached_fileencoding); } - set { base[fileEncodingProp] = value.EncodingName; } + set { base[fileEncodingProp] = value.WebName; } } [ConfigurationProperty ("requestEncoding", DefaultValue = "utf-8")] public Encoding RequestEncoding { get { return GetEncoding (requestEncodingProp, ref cached_requestencoding); } - set { base[requestEncodingProp] = value.EncodingName; } + set { base[requestEncodingProp] = value.WebName; } } [ConfigurationProperty ("resourceProviderFactoryType", DefaultValue = "")] @@ -153,13 +153,13 @@ namespace System.Web.Configuration { [ConfigurationProperty ("responseEncoding", DefaultValue = "utf-8")] public Encoding ResponseEncoding { get { return GetEncoding (responseEncodingProp, ref cached_responseencoding); } - set { base[responseEncodingProp] = value.EncodingName; } + set { base[responseEncodingProp] = value.WebName; } } [ConfigurationProperty ("responseHeaderEncoding", DefaultValue = "utf-8")] public Encoding ResponseHeaderEncoding { get { return GetEncoding (responseHeaderEncodingProp, ref cached_responseheaderencoding); } - set { base[responseHeaderEncodingProp] = value.EncodingName; } + set { base[responseHeaderEncodingProp] = value.WebName; } } [ConfigurationProperty ("uiCulture", DefaultValue = "")] @@ -257,7 +257,8 @@ namespace System.Web.Configuration { cached_encoding_name = ((enc == null) ? "utf-8" : enc); Encoding encoding = (Encoding)encodingHash [prop]; - if (encoding == null || encoding.EncodingName != cached_encoding_name) { + if (encoding == null || encoding.WebName != cached_encoding_name) { + Console.WriteLine ("HERE"); try { switch (cached_encoding_name.ToLower (Helpers.InvariantCulture)) { case "utf-16le": @@ -289,7 +290,7 @@ namespace System.Web.Configuration { } encodingHash[prop] = encoding; - cached_encoding_name = encoding.EncodingName; + cached_encoding_name = encoding.WebName; return encoding; } |