Bugzilla #351: ignore-reload should override max-age=0

diff --git a/src/refresh.cc b/src/refresh.cc
index 03dc125044d7eafc280080b08375fbbb50b34d14..b743feaf9f5d70bfbf4e58e3bcc3205cfad52e07 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: refresh.cc,v 1.56 2001/07/12 19:40:32 wessels Exp $
+ * $Id: refresh.cc,v 1.57 2002/06/14 19:26:43 hno Exp $
  *
  * DEBUG: section 22    Refresh Calculation
  * AUTHOR: Harvest Derived
@@ -265,6 +265,10 @@ refreshCheck(const StoreEntry * entry, request_t * request, time_t delta)
 #endif
        if (NULL != cc) {
            if (cc->max_age > -1) {
+#if HTTP_VIOLATIONS
+               if (R->flags.ignore_reload && cc->max_age == 0) {
+               } else
+#endif
                if (age > cc->max_age) {
                    debug(22, 3) ("refreshCheck: YES: age > client-max-age\n");
                    return STALE_EXCEEDS_REQUEST_MAX_AGE_VALUE;