Don't stop h1 dispatcher on upgrade handler with await (#149) (#178)

ntex/src/http/h1/dispatcher.rs

@@ -219,6 +219,9 @@ where
                                     }
                                 }
                                 None
+                            } else if this.inner.flags.contains(Flags::UPGRADE_HND) {
+                                // continue on upgrade handler processing
+                                return Poll::Pending;
                             } else if this.inner.poll_io_closed(cx) {
                                 // check if io is closed
                                 *this.st = State::Stop;

ntex/tests/http_ws_client.rs

@@ -4,6 +4,8 @@ use ntex::codec::BytesCodec;
 use ntex::http::test::server as test_server;
 use ntex::http::{body::BodySize, h1, HttpService, Request, Response};
 use ntex::io::{DispatchItem, Dispatcher, Io};
+use ntex::service::{fn_factory_with_config, fn_service};
+use ntex::web::{self, App, HttpRequest};
 use ntex::ws::{self, handshake_response};
 use ntex::{time::Seconds, util::ByteString, util::Bytes, util::Ready};
 
@@ -148,3 +150,37 @@ async fn test_keepalive_timeout() {
     let item = rx.recv().await;
     assert!(item.is_none());
 }
+
+#[ntex::test]
+async fn test_upgrade_handler_with_await() {
+    async fn service(_: ws::Frame) -> Result<Option<ws::Message>, io::Error> {
+        Ok(None)
+    }
+
+    let srv = test_server(|| {
+        HttpService::build().finish(App::new().service(web::resource("/").route(web::to(
+            |req: HttpRequest| async move {
+                // some async context switch
+                ntex::time::sleep(ntex::time::Seconds::ZERO).await;
+
+                web::ws::start::<_, _, web::Error>(
+                    req,
+                    fn_factory_with_config(|_| async {
+                        Ok::<_, web::Error>(fn_service(service))
+                    }),
+                )
+                .await
+            },
+        ))))
+    });
+
+    let _ = ws::WsClient::build(srv.url("/"))
+        .address(srv.addr())
+        .timeout(Seconds(1))
+        .keepalive_timeout(Seconds(1))
+        .finish()
+        .unwrap()
+        .connect()
+        .await
+        .unwrap();
+}