In System.Web:

2008-06-27  Robert Jordan  <robertj@gmx.net>

	* HttpCachePolicy.cs: map default HttpCacheability to
	"Cache-control: private" for MS.NET compatibility.
	Fixes bug #404083. Contributed by
	Hubert FONGARNAND <informatique.internet@fiducial.fr>.

In System.Web.Util:
2008-06-27  Robert Jordan  <robertj@gmx.net>

	* TimeUtil.cs (ToUtcTimeString): convert using the invariant
	culture. Fixes bug #404083. Contributed by
	Hubert FONGARNAND <informatique.internet@fiducial.fr>.

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

diff --git a/mcs/class/System.Web/System.Web.Util/ChangeLog b/mcs/class/System.Web/System.Web.Util/ChangeLog
index 97fbf70b7ace11a768f68919938704c91031e02b..e6b2aff1d32b293eb24b86403a5665b393dee307 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Util/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-27  Robert Jordan  <robertj@gmx.net>
+
+       * TimeUtil.cs (ToUtcTimeString): convert using the invariant
+       culture. Fixes bug #404083. Contributed by
+       Hubert FONGARNAND <informatique.internet@fiducial.fr>.
+
 2008-06-16  Marek Habersack  <mhabersack@novell.com>
 
        * UrlUtils.cs: optimize string usage (do not compare against "").

diff --git a/mcs/class/System.Web/System.Web.Util/TimeUtil.cs b/mcs/class/System.Web/System.Web.Util/TimeUtil.cs
index 47ef8ef4e40fd1b183aec628ba6298ef288a5257..7c0b90143b5b27515bf1a7b3a4764885cd96d582 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/TimeUtil.cs
+++ b/mcs/class/System.Web/System.Web.Util/TimeUtil.cs
@@ -29,6 +29,7 @@
 //
 
 using System;
+using System.Globalization;
 
 namespace System.Web.Util {
 
@@ -38,7 +39,8 @@ namespace System.Web.Util {
                
                internal static string ToUtcTimeString (DateTime dt)
                {
-                       return dt.ToUniversalTime ().ToString ("ddd, d MMM yyyy HH:mm:ss ") + "GMT";
+                       return dt.ToUniversalTime ().ToString ("ddd, d MMM yyyy HH:mm:ss ",
+                               CultureInfo.InvariantCulture) + "GMT";
                }
        }
 }

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index db71ff3fdaa1927bfbf9d48ab13450f98ea76871..64cf711d30ac70dbbeee482a4506a97f119dd7e3 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-27  Robert Jordan  <robertj@gmx.net>
+
+       * HttpCachePolicy.cs: map default HttpCacheability to
+       "Cache-control: private" for MS.NET compatibility.
+       Fixes bug #404083. Contributed by
+       Hubert FONGARNAND <informatique.internet@fiducial.fr>.
+
 2008-06-21  Robert Jordan  <robertj@gmx.net>
 
        * HttpRuntime.cs (.cctor): Workaround for bug #402263.

diff --git a/mcs/class/System.Web/System.Web/HttpCachePolicy.cs b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
index 100e35a41cff72233f837f21e18a6de6e8c744ec..5ba0ee3e26823675aea19c65146ad85b4a70d73d 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
+++ b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
@@ -358,17 +358,17 @@ namespace System.Web {
                                cc = "public";
                                break;
 
-                       case HttpCacheability.Private:
-                       case HttpCacheability.ServerAndPrivate:
-                               cc = "private";
-                               break;
-
                        case HttpCacheability.NoCache:
                        case HttpCacheability.ServerAndNoCache:
-                       default:
                                noCache = true;
                                cc = "no-cache";
                                break;
+
+                       case HttpCacheability.Private:
+                       case HttpCacheability.ServerAndPrivate:
+                       default:
+                               cc = "private";
+                               break;
                        }
 
                        if (noCache) {