From fb6c16fcb2c9f9f48abfc264d63b4641251f30de Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 5 Apr 2022 16:58:23 -0700
Subject: [PATCH] Disable keep-alive timeout for websockets endpoint

---
 ntex/CHANGES.md    | 4 +++-
 ntex/Cargo.toml    | 2 +-
 ntex/src/web/ws.rs | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md
index 26956ecb..fc79a281 100644
--- a/ntex/CHANGES.md
+++ b/ntex/CHANGES.md
@@ -2,7 +2,9 @@
 
 ## [0.5.16] - 2022-04-05
 
-* Add keep-alive timeout support to websockets client
+* ws: Add keep-alive timeout support to websockets client
+
+* web: Disable keep-alive timeout for websockets endpoint
 
 ## [0.5.15] - 2022-02-18
 
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index 2d8ce7d4..20701acc 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -107,5 +107,5 @@ time = "0.3"
 futures-util = "0.3"
 tls-openssl = { version="0.10", package = "openssl" }
 tls-rustls = { version = "0.20", package="rustls", features = ["dangerous_configuration"]  }
-rustls-pemfile = { version = "0.2" }
+rustls-pemfile = { version = "0.3" }
 webpki-roots = { version = "0.22" }
diff --git a/ntex/src/web/ws.rs b/ntex/src/web/ws.rs
index 4d0ce708..eb52741b 100644
--- a/ntex/src/web/ws.rs
+++ b/ntex/src/web/ws.rs
@@ -9,7 +9,7 @@ use crate::service::{
 };
 use crate::web::{HttpRequest, HttpResponse};
 use crate::ws::{error::HandshakeError, error::WsError, handshake};
-use crate::{io::DispatchItem, rt, util::Either, util::Ready, ws};
+use crate::{io::DispatchItem, rt, time::Seconds, util::Either, util::Ready, ws};
 
 /// Do websocket handshake and start websockets service.
 pub async fn start<T, F, Err>(req: HttpRequest, factory: F) -> Result<HttpResponse, Err>
@@ -98,7 +98,9 @@ where
 
     // start websockets service dispatcher
     rt::spawn(async move {
-        let res = crate::io::Dispatcher::new(io, codec, srv).await;
+        let res = crate::io::Dispatcher::new(io, codec, srv)
+            .keepalive_timeout(Seconds::ZERO)
+            .await;
         log::trace!("Ws handler is terminated: {:?}", res);
     });