Remove HasCacheControl from here too (fixes the build)

diff --git a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
index 76a66935d405ab7588548110b7fbf8743be1ef92..3ec1c00cc9bbc3b162ee3f94c28682d3e7fd47ff 100644 (file)
--- a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
@@ -136,17 +136,16 @@ namespace System.Web.Handlers
 \r
                        long atime;\r
                        DateTime modifiedSince;\r
-                       bool hasCacheControl = HasCacheControl (request, request.QueryString, out atime);\r
                        bool hasIfModifiedSince = HasIfModifiedSince (context.Request, out modifiedSince);\r
                        \r
-                       if (hasCacheControl || hasIfModifiedSince) {\r
+                       if (hasIfModifiedSince) {\r
                                bool notModified = true;\r
                        \r
                                foreach (CompositeEntry entry in entries) {\r
                                        if (entry == null)\r
                                                continue;\r
                                        if (notModified) {\r
-                                               if ((hasCacheControl && entry.IsModifiedSince (atime)) || (hasIfModifiedSince && entry.IsModifiedSince (modifiedSince)))\r
+                                               if (hasIfModifiedSince && entry.IsModifiedSince (modifiedSince))\r
                                                        notModified = false;\r
                                        }\r
                                }\r