v0.33.8

src/proxy/upstream_helpers.rs

@@ -1,16 +1,4 @@
-fn request_id_hash(sequence: u64) -> String {
-    use rand::TryRng;
-    use sha2::{Digest, Sha256};
-
-    let mut nonce = [0u8; 32];
-    let mut rng = rand::rngs::SysRng;
-    rng.try_fill_bytes(&mut nonce)
-        .expect("secure operating system random source unavailable");
-    let mut hash = Sha256::new();
-    hash.update(sequence.to_be_bytes());
-    hash.update(nonce);
-    format!("{:x}", hash.finalize())
-}
+include!("request_id.rs");
 
 fn should_replace_error_page(response: &Response, minimal_welcome: bool) -> bool {
     !minimal_welcome
@@ -43,7 +31,13 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
         .unwrap_or_default()
         .tls;
     request.extensions_mut().insert(snapshot.clone());
-    let original_headers = request.headers().clone();
+    let original_headers = if snapshot.envelope.config.compression.enabled()
+        && request.method() != Method::HEAD
+    {
+        crate::compression::request_headers(request.headers())
+    } else {
+        HeaderMap::new()
+    };
     let method = request.method().clone();
     let is_head = method == Method::HEAD;
     let ws_attempt = request
@@ -242,6 +236,7 @@ async fn observe(State(state): State<Arc<App>>, mut request: Request, next: Next
             "x-rustproxy-request-id",
             "x-rustproxy-revision",
             "x-rust-proxy-backend",
+            "x-rustproxy-backend",
             "x-rust-proxy-backend-time",
             "x-rustproxy-backend-time",
             "x-cache",