Use draft async-h1

Author: rusty

Cargo.toml

@@ -33,7 +33,9 @@ sessions = ["async-session", "cookies"]
 unstable = []
 
 [dependencies]
-async-h1 = { version = "2.3.0", optional = true }
+# async-h1 = { version = "2.3.0", optional = true }
+# FIXME: for proposal purpose only
+async-h1 = { git = "https://github.com/pbzweihander/async-h1.git", branch = "cancellation", optional = true }
 async-session = { version = "3.0", optional = true }
 async-sse = "4.0.1"
 async-std = { version = "1.6.5", features = ["unstable"] }

src/listener/tcp_listener.rs

@@ -58,11 +58,19 @@ fn handle_tcp<State: Clone + Send + Sync + 'static>(
         let local_addr = stream.local_addr().ok();
         let peer_addr = stream.peer_addr().ok();
 
-        let fut = async_h1::accept(stream, |mut req| async {
-            req.set_local_addr(local_addr);
-            req.set_peer_addr(peer_addr);
-            app.respond(req).await
-        });
+        let opts = async_h1::ServerOptions {
+            stopper: app.stopper.clone(),
+            ..Default::default()
+        };
+        let fut = async_h1::accept_with_opts(
+            stream,
+            |mut req| async {
+                req.set_local_addr(local_addr);
+                req.set_peer_addr(peer_addr);
+                app.respond(req).await
+            },
+            opts,
+        );
 
         if let Err(error) = fut.await {
             log::error!("async-h1 error", { error: error.to_string() });

src/listener/unix_listener.rs

@@ -59,11 +59,19 @@ fn handle_unix<State: Clone + Send + Sync + 'static>(
         let local_addr = unix_socket_addr_to_string(stream.local_addr());
         let peer_addr = unix_socket_addr_to_string(stream.peer_addr());
 
-        let fut = async_h1::accept(stream, |mut req| async {
-            req.set_local_addr(local_addr.as_ref());
-            req.set_peer_addr(peer_addr.as_ref());
-            app.respond(req).await
-        });
+        let opts = async_h1::ServerOptions {
+            stopper: app.stopper.clone(),
+            ..Default::default()
+        };
+        let fut = async_h1::accept_with_opts(
+            stream,
+            |mut req| async {
+                req.set_local_addr(local_addr.as_ref());
+                req.set_peer_addr(peer_addr.as_ref());
+                app.respond(req).await
+            },
+            opts,
+        );
 
         if let Err(error) = fut.await {
             log::error!("async-h1 error", { error: error.to_string() });