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

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



svn path=/branches/mono-2-6/mcs/; revision=154497

7 files changed, 26 insertions, 5 deletions

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index eb590e08b61..154bcddba60 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+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-06  Marek Habersack  <mhabersack@novell.com>
 
 	* TemplateControlCompiler.cs: AssignPropertyForResources localizes
diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
index 5c3fdc24c56..f5783803bec 100644
--- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -425,6 +425,12 @@ namespace System.Web.Compilation
 				method.Statements.Add (expr);
 			}
 #endif
+			if (!pageParser.EnableViewStateMac) {
+				CodeAssignStatement stmt = new CodeAssignStatement ();
+				stmt.Left = new CodePropertyReferenceExpression (thisRef, "EnableViewStateMac");
+				stmt.Right = new CodePrimitiveExpression (false);
+				method.Statements.Add (stmt);
+			}
 		}
 
 #if NET_2_0
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 7e327890514..fdf48f4c759 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+	* PagesConfiguration.cs: default for EnableViewStateMac is true. Allow
+	setting it from a @Page directive.
+
 2009-05-14  Marek Habersack  <mhabersack@novell.com>
 
 	* HandlerFactoryConfiguration.cs: if we're matching a default
diff --git a/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs
index 4bc4bad718f..e9e82425eff 100644
--- a/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs
@@ -38,7 +38,7 @@ namespace System.Web.Configuration
 		internal bool Buffer = true;
 		internal PagesEnableSessionState EnableSessionState = PagesEnableSessionState.True;
 		internal bool EnableViewState = true;
-		internal bool EnableViewStateMac = false;
+		internal bool EnableViewStateMac = true;
 		internal bool SmartNavigation = false;
 		internal bool AutoEventWireup = true;
 		internal bool ValidateRequest = true;
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index b5fa0fb6488..0ea479e5969 100644
--- 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 2148abd64db..1797d897fad 100644
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -83,7 +83,7 @@ public partial class Page : TemplateControl, IHttpHandler
 	bool _hasEnabledControlArray;
 #endif
 	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 ea6b10ed24f..c971723d5c2 100644
--- a/mcs/class/System.Web/System.Web.UI/PageParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs
@@ -383,9 +383,8 @@ namespace System.Web.UI
 			enable_event_validation = GetBool (atts, "EnableEventValidation", enable_event_validation);
 			maintainScrollPositionOnPostBack = GetBool (atts, "MaintainScrollPositionOnPostBack", maintainScrollPositionOnPostBack);
 #endif
-			// Ignored by now
-			GetString (atts, "EnableViewStateMac", null);
-			GetString (atts, "SmartNavigation", null);
+ 			enableViewStateMac = GetBool (atts, "EnableViewStateMac", enableViewStateMac);
+			smartNavigation = GetBool (atts, "SmartNavigation", smartNavigation);
 
 			base.ProcessMainAttributes (atts);
 		}