fix handling upgrade

src/msg_handler/handler.rs

@@ -150,7 +150,18 @@ where
     res_backend.log_debug(&backend.server_name, &client_addr, Some("(from Backend)"));
     // let response_log = res_backend.status().to_string();
 
-    if res_backend.status() == StatusCode::SWITCHING_PROTOCOLS {
+    if res_backend.status() != StatusCode::SWITCHING_PROTOCOLS {
+      // Generate response to client
+      if self.generate_response_forwarded(&mut res_backend).is_ok() {
+        // info!("{} => {}", request_log, response_log);
+        res_backend.log_debug(&backend.server_name, &client_addr, Some("(to Client)"));
+        log_data.status_code(&res_backend.status()).output();
+        return Ok(res_backend);
+      } else {
+        return self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data);
+      }
+    }
+
     // Handle StatusCode::SWITCHING_PROTOCOLS in response
     let upgrade_in_response = extract_upgrade(res_backend.headers());
     if if let (Some(u_req), Some(u_res)) =
@@ -170,14 +181,12 @@ where
           error!("Response does not have an upgrade extension");
           return self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data);
         };
-          let mut response_upgraded = if let Ok(res) = onupgrade.await {
-            res
-          } else {
-            error!("No upgrade is available");
-            return self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data);
-          };
 
         self.globals.runtime_handle.spawn(async move {
+          let mut response_upgraded = onupgrade.await.map_err(|e| {
+            error!("Failed to upgrade response: {}", e);
+            anyhow!("Failed to upgrade response: {}", e)
+          })?;
           let mut request_upgraded = request_upgraded.await.map_err(|e| {
             error!("Failed to upgrade request: {}", e);
             anyhow!("Failed to upgrade request: {}", e)
@@ -187,7 +196,7 @@ where
             .map_err(|e| anyhow!("Coping between upgraded connections failed: {}", e))?;
           Ok(()) as Result<()>
         });
-          // info!("{} => {}", request_log, response_log);
+        log_data.status_code(&res_backend.status()).output();
         Ok(res_backend)
       } else {
         error!("Request does not have an upgrade extension");
@@ -200,17 +209,6 @@ where
       );
       self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data)
     }
-    } else {
-      // Generate response to client
-      if self.generate_response_forwarded(&mut res_backend).is_ok() {
-        // info!("{} => {}", request_log, response_log);
-        res_backend.log_debug(&backend.server_name, &client_addr, Some("(to Client)"));
-        log_data.status_code(&res_backend.status()).output();
-        Ok(res_backend)
-      } else {
-        self.return_with_error_log(StatusCode::INTERNAL_SERVER_ERROR, &mut log_data)
-      }
-    }
   }
 
   ////////////////////////////////////////////////////

src/proxy/proxy_tls.rs

@@ -101,7 +101,7 @@ where
   }
 
   #[cfg(feature = "h3")]
-  async fn parse_sni_and_get_crypto_h3<'a, 'b>(
+  async fn parse_sni_and_get_crypto_h3<'a>(
     &self,
     peeked_conn: &mut quinn::Connecting,
     server_crypto_map: &'a ServerCryptoMap,