v0.34.7

src/cache/model/views.rs

@@ -132,13 +132,18 @@ fn stale_mode(
         return None;
     }
     let stale_for = age.saturating_sub(ttl);
+    let max_stale = client_max_stale(request_headers);
+    // An explicit client limit must also constrain implicit Varnish grace.
+    // In particular, max-stale=0 must not serve a stale representation.
+    if matches!(max_stale, Some(Some(limit)) if stale_for > limit) {
+        return None;
+    }
     if stale_while_revalidate > 0 && stale_for <= stale_while_revalidate {
         return Some(true);
     }
-    match client_max_stale(request_headers) {
-        Some(None) => Some(false),
-        Some(Some(limit)) if stale_for <= limit => Some(false),
-        _ => None,
+    match max_stale {
+        Some(None) | Some(Some(_)) => Some(false),
+        None => None,
     }
 }