Author: kostat
Date: 2007-04-05 07:28:59 -0400 (Thu, 05 Apr 2007)
New Revision: 75426
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
trunk/mcs/class/System.Web/System.Web/ServerVariablesCollection.cs
Log:
use Invariant culture for string manipulations
Modified: trunk/mcs/class/System.Web/System.Web/ServerVariablesCollection.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ServerVariablesCollection.cs
2007-04-05 11:25:05 UTC (rev 75425)
+++ trunk/mcs/class/System.Web/System.Web/ServerVariablesCollection.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -59,7 +59,7 @@
//
if (standard){
sb.Append ("HTTP_");
- sb.Append (key.ToUpper ().Replace ("-", "_"));
+ sb.Append (key.ToUpper
(CultureInfo.InvariantCulture).Replace ("-", "_"));
sb.Append (":");
} else {
sb.Append (key);
@@ -103,7 +103,7 @@
if (null != hvalue && hvalue.Length > 0) {
hname =
HttpWorkerRequest.GetKnownRequestHeaderName (i);
if (null != hname && hname.Length > 0)
- Add ("HTTP_" + hname.ToUpper
().Replace ('-', '_'), hvalue);
+ Add ("HTTP_" + hname.ToUpper
(CultureInfo.InvariantCulture).Replace ('-', '_'), hvalue);
}
}
@@ -115,7 +115,7 @@
if (hname == null)
continue;
hvalue = unknown [i][1];
- Add ("HTTP_" + hname.ToUpper ().Replace
('-', '_'), hvalue);
+ Add ("HTTP_" + hname.ToUpper
(CultureInfo.InvariantCulture).Replace ('-', '_'), hvalue);
}
}
}
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:25:05 UTC (rev 75425)
+++ trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -723,7 +723,7 @@
s = s.Replace ("\"", "\\\"");
return "\"" + s + "\"";
} else if (ob is bool) {
- return ob.ToString().ToLower();
+ return ob.ToString().ToLowerInvariant();
} else {
return ob.ToString ();
}
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
2007-04-05 11:25:05 UTC (rev 75425)
+++
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -121,7 +121,7 @@
bool seen_year = false;
bool seen_month = false;
- pattern = pattern.ToLower ();
+ pattern = pattern.ToLower
(CultureInfo.InvariantCulture);
for (int i = 0; i < pattern.Length; i ++) {
char c = pattern[ i ];
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
2007-04-05 11:25:05 UTC (rev 75425)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -1273,7 +1273,7 @@
OnLoggedIn (EventArgs.Empty);
string url = DestinationPageUrl;
- if (Page.Request.Path.ToLower ().StartsWith
(FormsAuthentication.LoginUrl.ToLower ())) {
+ if (Page.Request.Path.StartsWith
(FormsAuthentication.LoginUrl, StringComparison.InvariantCultureIgnoreCase)) {
if (!String.IsNullOrEmpty
(FormsAuthentication.ReturnUrl))
Redirect
(FormsAuthentication.ReturnUrl);
else if (!String.IsNullOrEmpty
(DestinationPageUrl))
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-04-05 11:25:05 UTC (rev 75425)
+++
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -1004,16 +1004,10 @@
return null;
foreach (DictionaryEntry de in values) {
- string valueName = format == true ?
FormatOldParameter (de.Key.ToString ()) : de.Key.ToString ();
- if (name == valueName)
+ string valueName = format == true ?
FormatOldParameter (de.Key.ToString ()) : de.Key.ToString ();
+ if (String.Compare (name, valueName,
StringComparison.InvariantCultureIgnoreCase) == 0)
return values [de.Key];
}
- foreach (DictionaryEntry de in values) {
- string valueName = format == true ?
FormatOldParameter (de.Key.ToString ()) : de.Key.ToString ();
- valueName = valueName.ToLower ();
- if (name.ToLower () == valueName)
- return values [de.Key];
- }
return null;
}
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
2007-04-05 11:25:05 UTC (rev 75425)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
2007-04-05 11:28:59 UTC (rev 75426)
@@ -394,15 +394,9 @@
foreach (DictionaryEntry de in values) {
string valueName = format == true ?
FormatOldParameter (de.Key.ToString ()) : de.Key.ToString ();
- if (parameterName == valueName)
+ if (String.Compare(parameterName, valueName,
StringComparison.InvariantCultureIgnoreCase) == 0)
return values [de.Key];
}
- foreach (DictionaryEntry de in values) {
- string valueName = format == true ?
FormatOldParameter (de.Key.ToString ()) : de.Key.ToString ();
- valueName = valueName.ToLower ();
- if (parameterName.ToLower () == valueName)
- return values [de.Key];
- }
return null;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
