This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 89a5832 Fix 65404 - Manager status page was truncated
89a5832 is described below
commit 89a5832c1bda927edd958f2656c3251b531e326a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 28 17:29:28 2021 +0100
Fix 65404 - Manager status page was truncated
---
java/org/apache/catalina/manager/StatusTransformer.java | 12 ++++++------
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index 583d1a5..2cf2cc9 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -338,11 +338,11 @@ public class StatusTransformer {
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration =
- globalRequestProcessors.elements();
+ Enumeration<ObjectName> enumeration =
globalRequestProcessors.elements();
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
while (enumeration.hasMoreElements()) {
ObjectName objectName = enumeration.nextElement();
- if (name.equals(objectName.getKeyProperty("name"))) {
+ if (name.equals(objectName.getKeyProperty("name")) &&
objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
}
@@ -408,11 +408,11 @@ public class StatusTransformer {
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration =
- globalRequestProcessors.elements();
+ Enumeration<ObjectName> enumeration =
globalRequestProcessors.elements();
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
while (enumeration.hasMoreElements()) {
ObjectName objectName = enumeration.nextElement();
- if (name.equals(objectName.getKeyProperty("name"))) {
+ if (name.equals(objectName.getKeyProperty("name")) &&
objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc71ace..ba59869 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.0.9 (markt)" rtext="in development">
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>65404</bug>: Correct a regression in the fix for <bug>63362</bug>
+ that caused the server status page in the Manager web application to be
+ truncated if HTTP upgrade was used such as when starting a WebSocket
+ connection. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.8 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
