2007-11-13 Atsushi Enomoto <atsushi@ximian.com>

	* HttpRequestCachePolicy.cs
	  HttpCacheAgeControl.cs
	  HttpRequestCacheLevel.cs
	  RequestCacheLevel.cs : fixed enum value binary compat to .net.

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

diff --git a/mcs/class/System/System.Net.Cache/ChangeLog b/mcs/class/System/System.Net.Cache/ChangeLog
index 08fbaeff29e5cef257c1e1e9faa17818ebcb2873..e73f284ec29e1eaad1d14f93fc62e4e6c8958335 100644 (file)
--- a/mcs/class/System/System.Net.Cache/ChangeLog
+++ b/mcs/class/System/System.Net.Cache/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-13  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpRequestCachePolicy.cs
+         HttpCacheAgeControl.cs
+         HttpRequestCacheLevel.cs
+         RequestCacheLevel.cs : fixed enum value binary compat to .net.
+
 2004-09-10  Tim Coleman <tim@timcoleman.com>
        * HttpCacheAgeControl.cs HttpRequestCacheLevel.cs HttpRequestCachePolicy.cs 
        * RequestCacheLevel.cs RequestCachePolicy.cs:

diff --git a/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs b/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs
index f7d8c14db6291325aa161c591734b37bf0023b53..0e34ba530bf65d18735f1c46485f72a9df7c8585 100644 (file)
--- a/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs
+++ b/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs
@@ -35,11 +35,12 @@ namespace System.Net.Cache
 {
        public enum HttpCacheAgeControl
        {
+               None = 0,
+               MinFresh = 0x01,
                MaxAge = 0x02,
-               MaxAgeAndMaxStale = 0x06,
+               MaxAgeAndMinFresh = 0x03,
                MaxStale = 0x04,
-               MinFresh = 0x01,
-               MinFreshAndMaxAge = 0x03,
+               MaxAgeAndMaxStale = 0x06,
        }
 }
 

diff --git a/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs b/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs
index 37e9ea43af7995a593b986ca8439fb4f283da90b..a9338c77dcf51365356c65f68e6d63c41fbbfae1 100644 (file)
--- a/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs
+++ b/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs
@@ -35,15 +35,15 @@ namespace System.Net.Cache
 {
        public enum HttpRequestCacheLevel
        {
+               Default = 0x00,
                BypassCache = 0x01,
-               CacheIfAvailable = 0x03,
                CacheOnly = 0x02,
-               CacheOrNextCacheOnly = 0x06,
-               Default = 0x00,
-               NoCacheNoStore = 0x05,
+               CacheIfAvailable = 0x03,
+               Revalidate = 0x04,
+               Reload = 0x05,
+               NoCacheNoStore = 0x06,
+               CacheOrNextCacheOnly = 0x07,
                Refresh = 0x08,
-               Reload = 0x04,
-               Revalidate = 0x07
        }
 }
 

diff --git a/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs b/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs
index e2e098e65e723f2728d63421b92c89fcb1169c9d..3283efe1e0396e587e5baa5c8eaec868edbbdac4 100644 (file)
--- a/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs
+++ b/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs
@@ -35,7 +35,7 @@ using System;
 
 namespace System.Net.Cache 
 {
-       public sealed class HttpRequestCachePolicy : RequestCachePolicy
+       public class HttpRequestCachePolicy : RequestCachePolicy
        {
                #region Fields
 

diff --git a/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs b/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs
index 672a7eb37dd03ac38dcfb7073f196a512aba58ab..7a20f5517c7df20d47f36dbef8e269875d55b338 100644 (file)
--- a/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs
+++ b/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs
@@ -35,12 +35,13 @@ namespace System.Net.Cache
 {
        public enum RequestCacheLevel
        {
+               Default = 0x00,
                BypassCache = 0x01,
-               CacheIfAvailable = 0x03,
                CacheOnly = 0x02,
-               Default = 0x00,
-               NoCacheNoStore = 0x05,
-               Reload = 0x04
+               CacheIfAvailable = 0x03,
+               Revalidate = 0x04,
+               Reload = 0x05,
+               NoCacheNoStore = 0x06,
        }
 }