2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* System.Web.UI/PageParser.cs:
	* System.Web.UI/Page.cs:
	* System.Web.Compilation/PageCompiler.cs: default for
	EnableViewStateMac is true. Allow setting it from a @Page
	directive.

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 5cfee1313d655eb45277e71a34a3aa838c2f99e6..a94921d0c52fe13a7d1dffdf6f41949cbafafd2c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,6 +1,16 @@
+2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * PageCompiler.cs: default for EnableViewStateMac is true. Allow
+       setting it from a @Page directive.
+
 2010-03-17  Marek Habersack  <mhabersack@novell.com>
 
-       * AspGenerator.cs, AspParser.cs, TemplateControlCompiler.cs, TagType.cs, CodeRenderBuilder.cs: implemented the new <%: %> 4.0 html-encoded code render expression.
+       * AspGenerator.cs
+       * AspParser.cs:
+       * TemplateControlCompiler.cs:
+       * TagType.cs
+       * CodeRenderBuilder.cs: implemented the new <%: %> 4.0 html-encoded
+       code render expression.
 
 2010-03-06  Marek Habersack  <mhabersack@novell.com>
 

diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
index 3c0bfea23255448ebf8d13a7ebc9bbec3b1450b5..77460a0f7f5c4de19416cb4b3e8a94c302975f85 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -354,6 +354,14 @@ namespace System.Web.Compilation
                                expr.Method = new CodeMethodReferenceExpression (prop, "ValidateInput");
                                method.Statements.Add (expr);
                        }
+
+                       if (!pageParser.EnableViewStateMac) {
+                               CodeAssignStatement stmt = new CodeAssignStatement ();
+                               stmt.Left = new CodePropertyReferenceExpression (thisRef, "EnableViewStateMac");
+                               stmt.Right = new CodePrimitiveExpression (false);
+                               method.Statements.Add (stmt);
+                       }
+
                }
 
                CodeAssignStatement AssignOutputCacheParameter (CodeVariableReferenceExpression variable, string propName, object value)

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index cb8821b2d9baff0356cc641a7a409b068eb9ad3a..94629c328a6070099d108c651cd48293a451ffa0 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * PageParser.cs:
+       * Page.cs: default for EnableViewStateMac is true. Allow setting it
+       from a @Page directive.
+
 2010-01-20  Marek Habersack  <mhabersack@novell.com>
 
        * ObjectStateFormatter.cs: implemented support for IndexedString

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index c3f86937072259630c275fe395a03f8cb376dbad..3959e37c80dbc5c0409b64f06c66654fb2bb7a8c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -73,7 +73,7 @@ public partial class Page : TemplateControl, IHttpHandler
        string _focusedControlID;
        bool _hasEnabledControlArray;
        bool _viewState;
-       bool _viewStateMac;
+       bool _viewStateMac = true;
        string _errorPage;
        bool is_validated;
        bool _smartNavigation;

diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs
index bcbab1d6a8ecd194a3a949498701bfb79fe39c18..aff0ab7bdf26d6ce132d64a55c7a420430b199cf 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/PageParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs
@@ -335,9 +335,8 @@ namespace System.Web.UI
                        enable_event_validation = GetBool (atts, "EnableEventValidation", enable_event_validation);
                        maintainScrollPositionOnPostBack = GetBool (atts, "MaintainScrollPositionOnPostBack", maintainScrollPositionOnPostBack);
 
-                       // Ignored by now
-                       GetString (atts, "EnableViewStateMac", null);
-                       GetString (atts, "SmartNavigation", null);
+                       enableViewStateMac = GetBool (atts, "EnableViewStateMac", enableViewStateMac);
+                       smartNavigation = GetBool (atts, "SmartNavigation", smartNavigation);
 
                        base.ProcessMainAttributes (atts);
                }