You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/16 13:51:04 UTC
[tomcat] branch 10.1.x updated (81c69c7f93 -> 3a4397e301)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 81c69c7f93 Include binaries for Windows in files uploaded to Maven Central
new 2d2638326d Add note on JDT version
new 3a4397e301 Fix regression in fix for BZ 66574
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties.default | 3 +++
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix regression in fix for BZ 66574
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3a4397e30145156cb99162d7ce7936e2187d0d66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 16 14:50:28 2023 +0100
Fix regression in fix for BZ 66574
WebSocket session should report open until after the onClose event has
completed.
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java b/java/org/apache/tomcat/websocket/WsSession.java
index fc498b200f..0c75f92184 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -459,7 +459,7 @@ public class WsSession implements Session {
@Override
public boolean isOpen() {
- return state.get() == State.OPEN;
+ return state.get() == State.OPEN || state.get() == State.OUTPUT_CLOSING;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 805fbe2a84..932e42fa10 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,11 @@
Improve handling of error conditions for the WebSocket server,
particularly during Tomcat shutdown. (markt)
</fix>
+ <fix>
+ Correct a regression in the fix for <bug>66574</bug> that meant the
+ WebSocket session could return false for <code>onOpen()</code> before
+ the <code>onClose()</code> event had been completed. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add note on JDT version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2d2638326dc6e3838775e0c3651b30adb2252df6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 16 09:14:56 2023 +0100
Add note on JDT version
---
build.properties.default | 3 +++
1 file changed, 3 insertions(+)
diff --git a/build.properties.default b/build.properties.default
index bdcdee8ef5..f09773e627 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -141,6 +141,9 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# ----- Eclipse JDT, version 4.7 or later -----#
# See https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
+# 4.27 is the latest release that runs on Java 11
+# Later versions can be used but the official builds need to use 4.27
+#
# Checksum is from "SHA512 Checksums for 4.27" link at
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/checksum/eclipse-4.27-SUMSSHA512
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org