Author: mhabersack
Date: 2008-02-05 06:31:01 -0500 (Tue, 05 Feb 2008)
New Revision: 94870
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
Backport of r94869
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
===================================================================
---
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2008-02-05 11:28:34 UTC (rev 94869)
+++
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2008-02-05 11:31:01 UTC (rev 94870)
@@ -259,10 +259,19 @@
public void Parse (string file)
{
- isApplication = tparser.DefaultDirectiveName ==
"application";
#if ONLY_1_1
- InitParser (file);
+ Parse (file, true);
+#else
+ Parse (file, false);
#endif
+ }
+
+ public void Parse (string file, bool doInitParser)
+ {
+ isApplication = tparser.DefaultDirectiveName ==
"application";
+
+ if (doInitParser)
+ InitParser (file);
pstack.Parser.Parse ();
if (text.Length > 0)
@@ -455,7 +464,7 @@
file = GetIncludeFilePath
(tparser.BaseDir, file);
}
- Parse (file);
+ Parse (file, true);
break;
default:
break;
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
2008-02-05 11:28:34 UTC (rev 94869)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
2008-02-05 11:31:01 UTC (rev 94870)
@@ -1,3 +1,10 @@
+2008-02-05 Marek Habersack <[EMAIL PROTECTED]>
+
+ * AspGenerator.cs: introduced a new overload for the Parse method
+ which accepts a bool indicating whether or not to initialize the
+ parser. The overload is used when parsing server-side
+ includes. Fixes bug #357498
+
2008-02-04 Marek Habersack <[EMAIL PROTECTED]>
* AssemblyBuilder.cs: do not use WebEncoding.FileEncoding when
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
