2008-08-14 Marek Habersack <mhabersack@novell.com>

	* AspGenerator.cs: do not ignore directives inside HTML comments.

svn path=/trunk/mcs/; revision=110516

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index 36545c7be63473a64223dc2a537199130a98333c..2fc7f234ba307bdd58fc5a0446c384cac0ea330f 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -549,12 +549,7 @@ namespace System.Web.Compilation
                        if (ignore_text)
                                return;
 
-                       bool isComment = text.StartsWith ("<!--"
-#if NET_2_0
-                                                         , StringComparison.OrdinalIgnoreCase
-#endif
-                       );
-                       if (!isComment && text.IndexOf ("<%") != -1 && !inScript) {
+                       if (text.IndexOf ("<%") != -1 && !inScript) {
                                if (this.text.Length > 0)
                                        FlushText (true);
                                CodeRenderParser r = new CodeRenderParser (text, stack.Builder);

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index e9dd2feff09094f36ec0971aa8d61347bcb88924..35e40f1d41b6bce3e2fa455d0d35a2c31870c776 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,5 +1,7 @@
 2008-08-14  Marek Habersack  <mhabersack@novell.com>
 
+       * AspGenerator.cs: do not ignore directives inside HTML comments.
+
        * TemplateControlCompiler.cs: .NET allows for whitespace between
        the directive start (<%) and the directive type character. Added
        code which copes with such situations correctly.