From: Eduard Bagdasaryan Date: Fri, 24 Sep 2021 23:23:23 +0000 (+0000) Subject: Fixed a copy-paste typo in HttpHdrCc::hasMinFresh() (#901) X-Git-Tag: SQUID_6_0_1~287 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0072b1d26280de7c006f6009706bf4c2a131f0d;p=thirdparty%2Fsquid.git Fixed a copy-paste typo in HttpHdrCc::hasMinFresh() (#901) This bug could result in unexpected hits/misses because Squid used the cached CC:max-stale value (or -1) instead of CC:min-fresh when calculating entry freshness. Broken since 810d879. --- diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h index dc5506ce04..c795188314 100644 --- a/src/HttpHdrCc.h +++ b/src/HttpHdrCc.h @@ -137,7 +137,7 @@ public: void clearMaxStale() {setValue(max_stale,MAX_STALE_UNKNOWN,HttpHdrCcType::CC_MAX_STALE,false);} //manipulation for Cache-Control:min-fresh header - bool hasMinFresh(int32_t *val = nullptr) const { return hasDirective(HttpHdrCcType::CC_MIN_FRESH, max_stale, val); } + bool hasMinFresh(int32_t *val = nullptr) const { return hasDirective(HttpHdrCcType::CC_MIN_FRESH, min_fresh, val); } void minFresh(int32_t v) {if (v < 0) return; setValue(min_fresh,v,HttpHdrCcType::CC_MIN_FRESH); } void clearMinFresh() {setValue(min_fresh,MIN_FRESH_UNKNOWN,HttpHdrCcType::CC_MIN_FRESH,false);}