diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2012-04-15 06:28:13 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2012-04-15 06:28:33 +0400 |
| commit | 8d59c332ef7599bb36ca9a1898bf06afeaf5638a (patch) | |
| tree | ef7f2a15591a7fa3761f685f0fce532271643a9e /mcs/class/System.Web.Extensions | |
| parent | dc75067d8d73ea006e6ae90b0e24fd3195b7c561 (diff) | |
Remove HasCacheControl from here too (fixes the build)
Diffstat (limited to 'mcs/class/System.Web.Extensions')
| -rw-r--r-- | mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs | 5 |
1 files changed, 2 insertions, 3 deletions
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 76a66935d40..3ec1c00cc9b 100644 --- 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 long atime;
DateTime modifiedSince;
- bool hasCacheControl = HasCacheControl (request, request.QueryString, out atime);
bool hasIfModifiedSince = HasIfModifiedSince (context.Request, out modifiedSince);
- if (hasCacheControl || hasIfModifiedSince) {
+ if (hasIfModifiedSince) {
bool notModified = true;
foreach (CompositeEntry entry in entries) {
if (entry == null)
continue;
if (notModified) {
- if ((hasCacheControl && entry.IsModifiedSince (atime)) || (hasIfModifiedSince && entry.IsModifiedSince (modifiedSince)))
+ if (hasIfModifiedSince && entry.IsModifiedSince (modifiedSince))
notModified = false;
}
}
|