v0.32.4

src/proxy/forward/upstream.rs

@@ -60,7 +60,23 @@ if pending_revalidation {
 if request.method() == Method::HEAD && cache_ticket.is_some() {
     *request.method_mut() = Method::GET;
 }
-*request.uri_mut() = uri.clone();
+// Preserve a pre-normalization Host snapshot for pool retries. Each next
+// backend gets its OWN target and Host/:authority, never the previous peer's.
+let retry_headers = request.headers().clone();
+let expected_backend_host = if backend.preserve_host {
+    &original_host
+} else {
+    &backend.host_header
+};
+let retry_host_follows_backend = retry_headers.get(HOST)
+    .is_some_and(|value| value == expected_backend_host);
+let Some(upstream_target) = upstream_request_target(
+    &uri, request.headers_mut(), &backend,
+    websocket_legacy_support && !websocket_upstream_h2, websocket_upstream_h2,
+) else {
+    return error(StatusCode::BAD_GATEWAY, "RustProxy: invalid upstream authority\n");
+};
+*request.uri_mut() = upstream_target.clone();
 let upstream_version = if websocket_legacy_support && !websocket_upstream_h2 {
     Version::HTTP_11
 } else {
@@ -107,17 +123,7 @@ let proactive_base_headers = request.headers().clone();
 let response_header_timeout = frontend
     .and_then(|frontend| frontend.proxy_timeouts.response_header_timeout())
     .unwrap_or(state.header_timeout);
-let retry_headers = request.headers().clone();
 let retry_method = request.method().clone();
-let expected_backend_host = if backend.preserve_host {
-    &original_host
-} else {
-    &backend.host_header
-};
-let retry_host_follows_backend = request
-    .headers()
-    .get(HOST)
-    .is_some_and(|value| value == expected_backend_host);
 let retry_policy = route.pool.as_ref().map(|pool| pool.settings.retry.clone());
 let retry_enabled = route.backend_id.is_none()
     && !admin_control_plane
@@ -131,7 +137,7 @@ let mut active_backend = backend.clone();
 let mut active_lease = backend_lease.clone();
 drop(backend_lease);
 let mut active_affinity_cookie = affinity_cookie.clone();
-let mut active_uri = uri.clone();
+let mut active_uri = upstream_target;
 let mut request_attempt = Some(request);
 let mut attempted_backends = Vec::<String>::new();
 let mut retries = 0u8;