v0.34.7

src/cache/policy/response.rs

@@ -92,6 +92,14 @@ pub fn plan(
     {
         return None;
     }
+    // Varnish builtin.vcl treats these as uncacheable origin responses
+    // (hit-for-miss is not implemented by RustProxy). Never weaken private
+    // or no-store handling even if Surrogate-Control is also present.
+    if settings.varnish_compatible
+        && (control.contains_key("no-cache") || surrogate_no_store(headers))
+    {
+        return None;
+    }
     let requires_revalidation = control.contains_key("no-cache");
     let must_revalidate = control.contains_key("must-revalidate");
     let proxy_revalidate = control.contains_key("proxy-revalidate");
@@ -102,7 +110,7 @@ pub fn plan(
             Some(None) => None,
         }
     };
-    let stale_while_revalidate = parse_window("stale-while-revalidate")?;
+    let mut stale_while_revalidate = parse_window("stale-while-revalidate")?;
     let stale_if_error = parse_window("stale-if-error")?;
     if requires_revalidation
         && !headers.contains_key("etag")
@@ -148,6 +156,18 @@ pub fn plan(
         None if requires_revalidation => 0,
         None => return None,
     };
+    // Like Varnish's built-in VCL, a backend response with no remaining
+    // freshness is not a reusable shared object (Varnish stores a hit-for-miss
+    // marker instead; RustProxy does not implement those markers).
+    if settings.varnish_compatible && initial_age.as_secs() >= ttl {
+        return None;
+    }
+    // Varnish defaults to ten seconds of grace after a *positive* TTL.
+    // Keep RustProxy's existing must-revalidate/proxy-revalidate safety checks;
+    // never turn a no-cache or zero-TTL response into a grace HIT.
+    if settings.varnish_compatible && stale_while_revalidate == 0 {
+        stale_while_revalidate = 10;
+    }
     if !requires_revalidation
         && initial_age.as_secs()
             >= retention_deadline(