From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 26 Sep 2011 19:50:51 +0000 (+0200)
Subject: Made some "unset" checks explicit.
X-Git-Tag: BumpSslServerFirst.take01~126^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaacc8b82b59873619fa24b2c5e8bdc806cef5bb;p=thirdparty%2Fsquid.git

Made some "unset" checks explicit.
---

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 92d61ebc48..6ff6694561 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -334,7 +334,7 @@ HttpReply::hdrExpirationTime()
             if (cache_control->getSMaxAge() != HttpHdrCc::S_MAXAGE_UNSET)
                 return date + cache_control->getSMaxAge();
 
-            if (cache_control->getMaxAge() >= 0)
+            if (cache_control->getMaxAge() != HttpHdrCc::MAX_AGE_UNSET)
                 return date + cache_control->getMaxAge();
         } else {
             /*
@@ -342,10 +342,10 @@ HttpReply::hdrExpirationTime()
              * header, but no Date for reference?
              */
 
-            if (cache_control->getSMaxAge()!=HttpHdrCc::S_MAXAGE_UNSET)
+            if (cache_control->getSMaxAge() != HttpHdrCc::S_MAXAGE_UNSET)
                 return squid_curtime;
 
-            if (cache_control->getMaxAge() >= 0)
+            if (cache_control->getMaxAge() != HttpHdrCc::MAX_AGE_UNSET)
                 return squid_curtime;
         }
     }
diff --git a/src/refresh.cc b/src/refresh.cc
index abb79c36ce..fa603a9144 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -336,7 +336,7 @@ refreshCheck(const StoreEntry * entry, HttpRequest * request, time_t delta)
 
 #endif
         if (NULL != cc) {
-            if (cc->getMaxAge() >= 0) {
+            if (cc->getMaxAge() != HttpHdrCc::MAX_AGE_UNSET) {
 #if USE_HTTP_VIOLATIONS
                 if (R->flags.ignore_reload && cc->getMaxAge() == 0) {
                     debugs(22, 3, "refreshCheck: MAYBE: client-max-age = 0 and ignore-reload");