Author: gonzalo
Date: 2005-06-26 21:23:02 -0400 (Sun, 26 Jun 2005)
New Revision: 46532
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
Log:
2005-06-26 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* TagAttributes.cs:
* AspParser.cs:
* TemplateControlCompiler.cs: use invariant culture versions of starts/
endswith.
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
2005-06-27 01:21:04 UTC (rev 46531)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
2005-06-27 01:23:02 UTC (rev 46532)
@@ -32,6 +32,7 @@
using System.Globalization;
using System.IO;
using System.Text;
+using System.Web.Util;
namespace System.Web.Compilation
{
@@ -188,12 +189,12 @@
if (len < 10 || lastQuote != len - 1)
return false;
- if (!str.ToLower
(CultureInfo.InvariantCulture).StartsWith ("#include "))
+ if (!StrUtils.StartsWith (str, "#include ", true))
return false;
str = str.Substring (9).Trim ();
- bool isfile = (str.ToLower
(CultureInfo.InvariantCulture).StartsWith ("file"));
- if (!isfile && !str.ToLower
(CultureInfo.InvariantCulture).StartsWith ("virtual"))
+ bool isfile = (StrUtils.StartsWith (str ,"file", true));
+ if (!isfile && !StrUtils.StartsWith (str, "virtual",
true))
return false;
pathType = (isfile) ? "file" : "virtual";
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-06-27
01:21:04 UTC (rev 46531)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-06-27
01:23:02 UTC (rev 46532)
@@ -1,3 +1,10 @@
+2005-06-26 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * TagAttributes.cs:
+ * AspParser.cs:
+ * TemplateControlCompiler.cs: use invariant culture versions of starts/
+ endswith.
+
2005-06-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* TemplateControlCompiler.cs: comparison between member name and the
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
2005-06-27 01:21:04 UTC (rev 46531)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
2005-06-27 01:23:02 UTC (rev 46532)
@@ -31,6 +31,7 @@
using System;
using System.Collections;
using System.Text;
+using System.Web.Util;
namespace System.Web.Compilation
{
@@ -149,7 +150,7 @@
if (att == null || !got_hashed)
return false;
- return (att.StartsWith ("<%#") && att.EndsWith ("%>"));
+ return (StrUtils.StartsWith (att, "<%#") &&
StrUtils.EndsWith (att, "%>"));
}
public Hashtable GetDictionary (string key)
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
2005-06-27 01:21:04 UTC (rev 46531)
+++
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
2005-06-27 01:23:02 UTC (rev 46532)
@@ -37,6 +37,7 @@
using System.Text;
using System.Web;
using System.Web.UI;
+using System.Web.Util;
using System.ComponentModel.Design.Serialization;
#if NET_2_0
using System.Collections.Specialized;
@@ -294,7 +295,7 @@
return false;
string str = value.Trim ();
- return (str.StartsWith ("<%#") && str.EndsWith ("%>"));
+ return (StrUtils.StartsWith (str, "<%#") &&
StrUtils.EndsWith (str, "%>"));
}
#if NET_2_0
@@ -302,7 +303,7 @@
{
string str = value.Trim ();
str = str.Substring (3).Trim (); // eats "<%#"
- if (str.StartsWith ("Bind")) {
+ if (StrUtils.StartsWith (str, "Bind")) {
Match match = bindRegex.Match (str);
if (match.Success) {
string bindingName = match.Groups
[1].Value;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
