0.29.7

src/proxy/forward/web_source.rs

@@ -102,7 +102,7 @@
                 }
                 response.extensions_mut().insert(ResponseRulesApplied);
                 response.extensions_mut().insert(StaticSourceResponse);
-                return response;
+                return intercept_route_origin_error(response, route, &snapshot);
                 }
             }
         }
@@ -115,7 +115,7 @@
     // await: the filesystem/PHP source owns the body for its full lifetime.
     let static_body = std::mem::replace(request.body_mut(), Body::empty());
     let started = Instant::now();
-    let mut response = crate::web_server::serve(service, request_method.clone(),
+    let response = crate::web_server::serve(service, request_method.clone(),
         request_headers.clone(), request_uri, &service_path, static_body,
         crate::web_server::RequestContext {
             client_ip: context.client_ip,
@@ -130,6 +130,7 @@
         response.status(), &fallback_request, &fallback_body,
     ).await { return fallback; }
 
+    let mut response = intercept_route_origin_error(response, route, &snapshot);
     let origin_headers = response.headers().clone();
     let original_plan = crate::cache::plan(response.status(), &origin_headers,
         cache_settings, started.elapsed());
@@ -151,6 +152,10 @@
     });
     apply_response_rules(response.headers_mut(), &snapshot, route.frontend.as_deref(),
         Some(route), false);
+    if response.extensions().get::<crate::pages::PageServed>().is_some() {
+        // A vhost header rule must not make a replaced error cacheable.
+        response.headers_mut().insert("cache-control", HeaderValue::from_static("no-store"));
+    }
     response.extensions_mut().insert(ResponseRulesApplied);
     response.extensions_mut().insert(StaticSourceResponse);