v0.34.0_1

src/proxy/forward/route_cache.rs

@@ -4,16 +4,16 @@
 // allow-only country entries and explicit IP allows form one policy scope.
 if let Some(exchange) = request.extensions().get::<Arc<Exchange>>() {
     *exchange.route.lock().unwrap_or_else(|e| e.into_inner()) = Some(route.id.clone());
-    *exchange.source.lock().unwrap_or_else(|e| e.into_inner()) = if route.response.is_some() {
-        "local_response"
+    exchange.set_source(if route.response.is_some() {
+        ExchangeSource::LocalResponse
     } else if route.redirect.is_some() {
-        "local_redirect"
+        ExchangeSource::LocalRedirect
     } else {
         match &route.source {
-            crate::config::CompiledSource::WebServer(_) => "web_server",
-            crate::config::CompiledSource::ReverseProxy => "reverse_proxy",
+            crate::config::CompiledSource::WebServer(_) => ExchangeSource::WebServer,
+            crate::config::CompiledSource::ReverseProxy => ExchangeSource::ReverseProxy,
         }
-    };
+    });
 }
 // Local location responses intentionally still pass host/profile/location ACLs
 // and the outer response-header/security pipeline, but never select/open an upstream.
@@ -126,10 +126,8 @@ let transform_settings = route.frontend.as_ref().map(|f| &f.transform);
 let scope = route.frontend.as_ref().map(|f| f.id.as_str()).unwrap_or("");
 if let Some(exchange) = request.extensions().get::<Arc<Exchange>>() {
     *exchange.route.lock().unwrap_or_else(|e| e.into_inner()) = Some(route.id.clone());
-    *exchange.cache_effective_enabled.lock().unwrap_or_else(|e| e.into_inner()) =
-        Some(cache_settings.active_for(route.cache));
-    *exchange.transform_effective_enabled.lock().unwrap_or_else(|e| e.into_inner()) =
-        Some(transform_settings.is_some_and(|settings| settings.enabled));
+    exchange.set_cache_enabled(cache_settings.active_for(route.cache));
+    exchange.set_transform_enabled(transform_settings.is_some_and(|settings| settings.enabled));
 }
 let policy_reason = if admin_control_plane {
     Some("admin_control_plane")
@@ -304,7 +302,8 @@ let key_headers = cache_key_headers
     .as_ref()
     .unwrap_or_else(|| request.headers());
 let cache_ticket = if effective_cacheable {
-    state.cache.ticket_scoped(
+    state.cache.ticket_scoped_for_config(
+        snapshot.envelope.revision,
         state.cache.revision(),
         route.frontend.as_ref().map(|f| f.id.as_str()).unwrap_or(""),
         context.scheme,