This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9cc94bd Fix write timeout check
9cc94bd is described below
commit 9cc94bd751d90c0a3f65e58198293b88f5318de9
Author: remm <r...@apache.org>
AuthorDate: Wed Aug 18 16:54:36 2021 +0200
Fix write timeout check
BZ 65506. Fix write timeout check that was using the read timeout value.
Patch submitted by Gustavo Mahlow
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 3f33099..5859a02 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -937,7 +937,7 @@ public class WsSession implements Session {
if (timeoutRead > 0 && (currentTime - lastActiveRead) > timeoutRead) {
key = "wsSession.timeoutRead";
- } else if (timeoutWrite > 0 && (currentTime - lastActiveWrite) >
timeoutRead) {
+ } else if (timeoutWrite > 0 && (currentTime - lastActiveWrite) >
timeoutWrite) {
key = "wsSession.timeoutWrite";
} else if (timeout > 0 && (currentTime - lastActiveRead) > timeout &&
(currentTime - lastActiveWrite) > timeout) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a741f7..e720724 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ <bug>65506</bug>: Fix write timeout check that was using the read
+ timeout value. Patch submitted by Gustavo Mahlow. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
