2009-06-15 Marek Habersack <mhabersack@novell.com>

	* HttpCachePolicy.cs: SetHeaders adds max-age when MaxAge is set
	to TimeSpan.Zero by calling SetMaxAge. Fixes bug #513000

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 68071c861ae5730ff2b890dece77c668f08fad9e..1de7f66908e7a0cb9f3dec493b7318dbbb0cb430 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-15  Marek Habersack  <mhabersack@novell.com>
+
+       * HttpCachePolicy.cs: SetHeaders adds max-age when MaxAge is set
+       to TimeSpan.Zero by calling SetMaxAge. Fixes bug #513000
+
 2009-06-05  Marek Habersack  <mhabersack@novell.com>
 
        * VirtualPathUtility.cs: IsValidVirtualPath no longer uses

diff --git a/mcs/class/System.Web/System.Web/HttpCachePolicy.cs b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
index ebd20042d711a162959ae28ce72aa73e89c94799..c6e415b20ee975eeed391024fd35dc525fcfffc1 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
+++ b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
@@ -351,7 +351,7 @@ namespace System.Web
                                        headers.Add ("Pragma", "no-cache");
                                }
                        } else {
-                               if (MaxAge.TotalSeconds != 0)
+                               if (HaveMaxAge)
                                        cc = String.Concat (cc, ", max-age=", ((long) MaxAge.TotalSeconds).ToString ());
 
                                if (have_expire_date) {