Author: kostat
Date: 2007-04-05 07:43:27 -0400 (Thu, 05 Apr 2007)
New Revision: 75429
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/AuthorizationConfig.cs
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
trunk/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
use Invariant culture for string manipulations
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/AuthorizationConfig.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/AuthorizationConfig.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/AuthorizationConfig.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -32,6 +32,7 @@
using System.Collections;
using System.Security.Principal;
using System.Web.UI;
+using System.Globalization;
namespace System.Web.Configuration
{
@@ -165,7 +166,7 @@
public bool CheckVerb (string verb)
{
foreach (string u in Verbs) {
- if (String.Compare (u, verb, true) == 0)
+ if (String.Compare (u, verb, true,
CultureInfo.InvariantCulture) == 0)
return true;
}
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -33,7 +33,8 @@
using System.Security.Principal;
using System.Configuration;
using System.ComponentModel;
-using System.Xml;
+using System.Xml;
+using System.Globalization;
#if NET_2_0
@@ -221,8 +222,8 @@
internal bool CheckVerb (string verb)
{
- foreach (string v in Verbs) {
- if (String.Compare (v, verb, true) == 0)
+ foreach (string v in Verbs) {
+ if (String.Compare (v, verb, true,
CultureInfo.InvariantCulture) == 0)
return true;
}
return false;
@@ -230,8 +231,8 @@
internal bool CheckUser (string user)
{
- foreach (string u in Users) {
- if (String.Compare (u, user, true) == 0 ||
+ foreach (string u in Users) {
+ if (String.Compare (u, user, true,
CultureInfo.InvariantCulture) == 0 ||
u == "*" ||
(u == "?" && user == ""))
return true;
Modified: trunk/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -37,6 +37,7 @@
using System.Web;
using System.Web.Configuration;
using System.Web.Util;
+using System.Globalization;
namespace System.Web.Security
{
@@ -476,9 +477,9 @@
throw new ArgumentNullException
("passwordFormat");
byte [] bytes;
- if (String.Compare (passwordFormat, "MD5", true) == 0) {
+ if (String.Compare (passwordFormat, "MD5", true,
CultureInfo.InvariantCulture) == 0) {
bytes = MD5.Create ().ComputeHash
(Encoding.UTF8.GetBytes (password));
- } else if (String.Compare (passwordFormat, "SHA1",
true) == 0) {
+ } else if (String.Compare (passwordFormat, "SHA1",
true, CultureInfo.InvariantCulture) == 0) {
bytes = SHA1.Create ().ComputeHash
(Encoding.UTF8.GetBytes (password));
} else {
throw new ArgumentException ("The format must
be either MD5 or SHA1", "passwordFormat");
Modified: trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -40,6 +40,7 @@
using System.Text;
using System.Collections.Specialized;
using System.Web.Util;
+using System.Globalization;
namespace System.Web.UI
{
@@ -723,7 +724,7 @@
s = s.Replace ("\"", "\\\"");
return "\"" + s + "\"";
} else if (ob is bool) {
- return ob.ToString().ToLowerInvariant();
+ return ob.ToString ().ToLower
(CultureInfo.InvariantCulture);
} else {
return ob.ToString ();
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-04-05 11:41:44 UTC
(rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-04-05 11:43:27 UTC
(rev 75429)
@@ -43,6 +43,7 @@
using System.Security.Permissions;
using System.Web;
using System.Web.Util;
+using System.Globalization;
#if NET_2_0
using System.Web.UI.Adapters;
using System.IO;
@@ -740,7 +741,7 @@
Control result = null;
foreach (Control c in _controls) {
- if (String.Compare (id, c._userId, true) == 0) {
+ if (String.Compare (id, c._userId, true,
CultureInfo.InvariantCulture) == 0) {
if (result != null && result != c) {
throw new HttpException ("1
Found more than one control with ID '" + id + "'");
}
Modified: trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -186,7 +186,7 @@
if (hr != "")
#if TARGET_J2EE
// For J2EE portlets we need to
genreate a render URL.
- HRef = ResolveUrl (hr,
String.Compare(target, "_blank", true) != 0);
+ HRef = ResolveUrl (hr, String.Compare
(target, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0);
#else
HRef = ResolveUrl (hr);
#endif
Modified:
trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -30,6 +30,7 @@
using System.Collections;
using System.Security.Permissions;
using System.Web.UI.WebControls;
+using System.Globalization;
namespace System.Web.UI.HtmlControls
{
@@ -48,7 +49,7 @@
public override Type GetChildControlType (string tagName,
IDictionary attribs)
{
- if (System.String.Compare (tagName, "option", true) !=
0)
+ if (System.String.Compare (tagName, "option", true,
CultureInfo.InvariantCulture) != 0)
return null;
return typeof (ListItem);
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -166,8 +166,8 @@
string target =
spot.Target.Length > 0 ? spot.Target : Target;
if
(!String.IsNullOrEmpty (target))
writer.AddAttribute (HtmlTextWriterAttribute.Target, target);
-#if TARGET_J2EE
- string navUrl =
ResolveClientUrl (spot.NavigateUrl, String.Compare (target, "_blank", true) !=
0);
+#if TARGET_J2EE
+ string navUrl =
ResolveClientUrl (spot.NavigateUrl, String.Compare (target, "_blank",
StringComparison.InvariantCultureIgnoreCase) != 0);
#else
string navUrl =
ResolveClientUrl (spot.NavigateUrl);
#endif
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -1851,8 +1851,8 @@
}
else if (item.NavigateUrl != "") {
string target = item.Target != "" ? item.Target
: Target;
-#if TARGET_J2EE
- string navUrl = ResolveClientUrl
(item.NavigateUrl, String.Compare (target, "_blank", true) != 0);
+#if TARGET_J2EE
+ string navUrl = ResolveClientUrl
(item.NavigateUrl, String.Compare (target, "_blank",
StringComparison.InvariantCultureIgnoreCase) != 0);
#else
string navUrl = ResolveClientUrl
(item.NavigateUrl);
#endif
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
2007-04-05 11:41:44 UTC (rev 75428)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
2007-04-05 11:43:27 UTC (rev 75429)
@@ -1652,7 +1652,7 @@
if (node.NavigateUrl != "") {
string target = node.Target.Length > 0 ?
node.Target : Target;
#if TARGET_J2EE
- string navUrl = ResolveClientUrl
(node.NavigateUrl, String.Compare (target, "_blank", true) != 0);
+ string navUrl = ResolveClientUrl
(node.NavigateUrl, String.Compare (target, "_blank",
StringComparison.InvariantCultureIgnoreCase) != 0);
#else
string navUrl = ResolveClientUrl
(node.NavigateUrl);
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
