Buildbot failure in on tomcat-11.0.x

2024-04-15 Thread buildbot 
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1029
Blamelist: Christopher Schultz 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] 460bea9e0af8a403df102f45cfe050f04bd98906


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_12: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 9.0.x updated: Align tags with XML declaration and Content-Type in @page.

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 3e9200e1ac Align  tags with XML declaration and Content-Type in 
@page.
3e9200e1ac is described below

commit 3e9200e1acc121b74e8c90c540e633738610fed7
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 16:40:56 2024 -0400

Align  tags with XML declaration and Content-Type in @page.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 1c587d4c25..80bfc7fdf0 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> certList = (Map>) 
request.getAttribute("certList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e6619ecf84..f59e87859c 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -27,7 +27,7 @@
 <% Map> cipherList = (Map>) 
request.getAttribute("cipherList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c543a9239e..f969e9a6fa 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> trustedCertList = (Map>) 
request.getAttribute("trustedCertList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 72b927d14e..3541f0dc31 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -45,7 +45,7 @@
"?path=" + path + "=" + version));
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 958c1be0a3..03346a839b 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -36,7 +36,7 @@
Collection activeSessions = (Collection) 
request.getAttribute("activeSessions");
 %>
 
-
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 10.1.x updated: Align tags with XML declaration and Content-Type in @page.

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 7e40b6dce3 Align  tags with XML declaration and Content-Type in 
@page.
7e40b6dce3 is described below

commit 7e40b6dce3c15395c2c6f3012fe91fc1c3e8e5cd
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 16:40:56 2024 -0400

Align  tags with XML declaration and Content-Type in @page.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 1c587d4c25..80bfc7fdf0 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> certList = (Map>) 
request.getAttribute("certList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e6619ecf84..f59e87859c 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -27,7 +27,7 @@
 <% Map> cipherList = (Map>) 
request.getAttribute("cipherList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c543a9239e..f969e9a6fa 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> trustedCertList = (Map>) 
request.getAttribute("trustedCertList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index bce1df3b5a..b76e6f08cc 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -45,7 +45,7 @@
"?path=" + path + "=" + version));
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 958c1be0a3..03346a839b 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -36,7 +36,7 @@
Collection activeSessions = (Collection) 
request.getAttribute("activeSessions");
 %>
 
-
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch main updated: Align tags with XML declaration and Content-Type in @page.

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz 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 460bea9e0a Align  tags with XML declaration and Content-Type in 
@page.
460bea9e0a is described below

commit 460bea9e0af8a403df102f45cfe050f04bd98906
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 16:40:56 2024 -0400

Align  tags with XML declaration and Content-Type in @page.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 1c587d4c25..80bfc7fdf0 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> certList = (Map>) 
request.getAttribute("certList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e6619ecf84..f59e87859c 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -27,7 +27,7 @@
 <% Map> cipherList = (Map>) 
request.getAttribute("cipherList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c543a9239e..f969e9a6fa 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -27,7 +27,7 @@
 <% Map> trustedCertList = (Map>) 
request.getAttribute("trustedCertList");
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index bce1df3b5a..b76e6f08cc 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -45,7 +45,7 @@
"?path=" + path + "=" + version));
 %>
 
-
+
 
 
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 958c1be0a3..03346a839b 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -36,7 +36,7 @@
Collection activeSessions = (Collection) 
request.getAttribute("activeSessions");
 %>
 
-
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 68890] Several JSPs in the manage application have contradicting encoding

2024-04-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

--- Comment #4 from Christopher Schultz  ---
(In reply to Mark Thomas from comment #3)
> The JSP prologue and pageEncoding MUST agree for JSP documents in XML syntax.

s/pageEncoding/contentType/?

pageEncoding specifies the encoding of the source document (.jsp file) but the
response. But maybe they also have to agree?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 10.1.x updated: Fix checkstyle warning

2024-04-15 Thread markt 
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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new b14669ad0b Fix checkstyle warning
b14669ad0b is described below

commit b14669ad0b1f2215c153f072852e6182a3bd555c
Author: Mark Thomas 
AuthorDate: Mon Apr 15 18:01:52 2024 +0100

Fix checkstyle warning
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 678db89c97..107df4d647 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 The Apache Tomcat® software is an open source implementation of the Jakarta
 Servlet, Jakarta Pages, Jakarta Expression Language and Jakarta WebSocket
 technologies. The Jakarta Servlet, Jakarta Server Pages, Jakarta Expression 
Language and
-Jakarta WebSocket specifications are developed as part of the 
+Jakarta WebSocket specifications are developed as part of the
 [Jakarta EE Platform](https://jakarta.ee/specifications/).
 
 The Apache Tomcat software is developed in an open and participatory


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch main updated: Fix checkstyle warning

2024-04-15 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt 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 feecd8628b Fix checkstyle warning
feecd8628b is described below

commit feecd8628bc72c307d4c407e958b7f22740d963f
Author: Mark Thomas 
AuthorDate: Mon Apr 15 18:00:12 2024 +0100

Fix checkstyle warning
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3b4507570e..a5be3e584e 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 The Apache Tomcat® software is an open source implementation of the Jakarta
 Servlet, Jakarta Pages, Jakarta Expression Language and Jakarta WebSocket
 technologies. The Jakarta Servlet, Jakarta Pages, Jakarta Expression Language 
and
-Jakarta WebSocket specifications are developed as part of the 
+Jakarta WebSocket specifications are developed as part of the
 [Jakarta EE Platform](https://jakarta.ee/specifications/).
 
 The Apache Tomcat software is developed in an open and participatory


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 68890] Several JSPs in the manage application have contradicting encoding

2024-04-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

--- Comment #3 from Mark Thomas  ---
For the record, Chris is correct.

The JSP prologue and pageEncoding MUST agree for JSP documents in XML syntax.

For JSP pages that are not in XML syntax, the prologue is just template text
that will be passed through to the output.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 68884] Delayed HTTP Traffic Processing After Mass Websocket Disconnect/Reconnect

2024-04-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68884

--- Comment #5 from Christopher Schultz  ---
I'm ignorant of the threading details of Websocket, so maybe this is a stupid
question: Could a single thread be used to perform these kinds of cleanups,
instead of an army of threads? That would let a single thread trigger many
session-shutdowns and only yield once for each of them.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 9.0.x updated: Add changelog

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0f04abd1e0 Add changelog
0f04abd1e0 is described below

commit 0f04abd1e087ef3a2bf3231d3172632c86c4c1b2
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:48:55 2024 -0400

Add changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9185af8d95..bb92070fa2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,10 @@
 does not represent a possible event in current implementations)
 statistics from the session manager. (remm)
   
+  
+68890 Align output encoding of JSPs in the Manager webapp
+with the XML declarations in those same files. (schultz)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 10.1.x updated: Add changelog

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new de5c8f1563 Add changelog
de5c8f1563 is described below

commit de5c8f1563c8a01114794e35deecf5e08cddd39b
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:48:55 2024 -0400

Add changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 143aea6a92..9b7db56706 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,10 @@
 does not represent a possible event in current implementations)
 statistics from the session manager. (remm)
   
+  
+68890 Align output encoding of JSPs in the Manager webapp
+with the XML declarations in those same files. (schultz)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch main updated: Add changelog

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz 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 563377b211 Add changelog
563377b211 is described below

commit 563377b2119fba2c6c105f9e497a15edf9027b2c
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:48:55 2024 -0400

Add changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0fca74c056..eb03e0624f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,10 @@
 does not represent a possible event in current implementations)
 statistics from the session manager. (remm)
   
+  
+68890 Align output encoding of JSPs in the Manager webapp
+with the XML declarations in those same files. (schultz)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 9.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7b40e25e0b Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890
7b40e25e0b is described below

commit 7b40e25e0baf043858d86bc59c5208c2e6eaaca7
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:44:14 2024 -0400

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

Align output encoding with claimed XML encoding.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 3012ead5f0..1c587d4c25 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e7cac121d5..e6619ecf84 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c0e4cb9b7e..c543a9239e 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 960de767fc..72b927d14e 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Enumeration" %>
 <%@page import="javax.servlet.http.HttpSession" %>
 <%@page import="org.apache.catalina.Session" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 7db8f18713..958c1be0a3 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Collection" %>
 <%@page import="org.apache.catalina.manager.JspHelper" %>
 <%@page import="org.apache.catalina.Session" %>


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch 10.1.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 0c45be93dd Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890
0c45be93dd is described below

commit 0c45be93ddfeefa94b8a6eb04a11ac42190fbb2c
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:44:14 2024 -0400

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

Align output encoding with claimed XML encoding.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 3012ead5f0..1c587d4c25 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e7cac121d5..e6619ecf84 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c0e4cb9b7e..c543a9239e 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 7c069dc66c..bce1df3b5a 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Enumeration" %>
 <%@page import="jakarta.servlet.http.HttpSession" %>
 <%@page import="org.apache.catalina.Session" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 7db8f18713..958c1be0a3 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Collection" %>
 <%@page import="org.apache.catalina.manager.JspHelper" %>
 <%@page import="org.apache.catalina.Session" %>


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 68890] Several JSPs in the manage application have contradicting encoding

2024-04-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

Christopher Schultz  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #2 from Christopher Schultz  ---
I've fixed the encoding declaration in 11402a58acfde441d947332c4a6f110a24658efd
in main and back-ported to the other versions.

I'm not going to remove any of the XML stuff at this point, since the page also
declares that is it XHTML. I'm not sure that .jsp versus .jspx has anything to
do with it, as any file processed by the JSP engine can produce output of any
kind, only identified by its Content-Type.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

(tomcat) branch main updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

2024-04-15 Thread schultz 
This is an automated email from the ASF dual-hosted git repository.

schultz 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 11402a58ac Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890
11402a58ac is described below

commit 11402a58acfde441d947332c4a6f110a24658efd
Author: Christopher Schultz 
AuthorDate: Mon Apr 15 11:44:14 2024 -0400

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

Align output encoding with claimed XML encoding.
---
 webapps/manager/WEB-INF/jsp/connectorCerts.jsp| 2 +-
 webapps/manager/WEB-INF/jsp/connectorCiphers.jsp  | 2 +-
 webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 3012ead5f0..1c587d4c25 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp 
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index e7cac121d5..e6619ecf84 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp 
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c0e4cb9b7e..c543a9239e 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.List" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 7c069dc66c..bce1df3b5a 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Enumeration" %>
 <%@page import="jakarta.servlet.http.HttpSession" %>
 <%@page import="org.apache.catalina.Session" %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index 7db8f18713..958c1be0a3 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page session="false" contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Collection" %>
 <%@page import="org.apache.catalina.manager.JspHelper" %>
 <%@page import="org.apache.catalina.Session" %>


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE][CANCELLED] Release Apache Tomcat 10.1.22

2024-04-15 Thread Christopher Schultz 

All,

I'm cancelling the vote due to an issue raised by rjung which could 
cause Java 11 environments to fail to start Tomcat due to the 
introduction of an unsupported JVM startup switch.


I'll re-roll the release with an updated script today.

Thanks,
-chris


The proposed Apache Tomcat 10.1.22 release is now available for
voting. Apache Tomcat 10.1.21 was canceled due to a release-build mistake. 
There are no source-level changes between 10.1.21 and 10.1.22.

The notable changes compared to 10.1.20 are:

- Add OpenSSL support when FFM is available

- Improve locking strategies in Catalina core

- Updates to Apache Commons dependencies

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 without 
changes. Java EE applications designed for Tomcat 9 and earlier may be placed 
in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically 
convert them to Jakarta EE and copy them to the webapps directory.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.22/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1491

The tag is:
https://github.com/apache/tomcat/tree/10.1.22
fd9c0bb1f0a7e586daabfda625ef50827bcfddf3

Please reply with a +1 for release or -0/-1 with an explanation.

The proposed 10.1.22 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.1.22


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: (tomcat) 01/06: Remove unused code - thanks to UCDetector

2024-04-15 Thread Christopher Schultz 

Mark,

On 4/15/24 11:13, Mark Thomas wrote:

On 05/04/2024 12:55, Mark Thomas wrote:

5 Apr 2024 04:33:42 Christopher Schultz :


Mark,

Can't this entire class be replaced with calls to 
java.util.Base64.get*Encoder and java.util.Base64.get*Decoder 
wherever necessary?


Now that 9.0.x is oldest, we should be able to use java.util.Base64 
from Java 1.8+


Possibly. There is a commit from 2.0.x that does that that we could 
back port.


The one thing I wanted to check was that the Tomcat one was stricter 
for URL safe Vs non URL safe. I wasn't sure how that applied here.


My main concern was aligning 9.0.x through 11.0.x which is now done. 
Improvements like this were next on the TODO list for File upload.


I've done more checks and it was the commons implementation that used 
the same decoder for standard and URL-safe. The Java implementation has 
specific decoders for each.


It looks like we can remove the o.a.tomcat.util.codec.binary package 
completely. I'll take a look. If it is possible then the plan would be 
remove in 11.0.x and deprecate in 10.1.x and earlier just in case 
someone is using the Tomcat internals directly.


+1

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: (tomcat) 01/06: Remove unused code - thanks to UCDetector

2024-04-15 Thread Mark Thomas 

On 05/04/2024 12:55, Mark Thomas wrote:

5 Apr 2024 04:33:42 Christopher Schultz :


Mark,

Can't this entire class be replaced with calls to 
java.util.Base64.get*Encoder and java.util.Base64.get*Decoder wherever 
necessary?


Now that 9.0.x is oldest, we should be able to use java.util.Base64 
from Java 1.8+


Possibly. There is a commit from 2.0.x that does that that we could back 
port.


The one thing I wanted to check was that the Tomcat one was stricter for 
URL safe Vs non URL safe. I wasn't sure how that applied here.


My main concern was aligning 9.0.x through 11.0.x which is now done. 
Improvements like this were next on the TODO list for File upload.


I've done more checks and it was the commons implementation that used 
the same decoder for standard and URL-safe. The Java implementation has 
specific decoders for each.


It looks like we can remove the o.a.tomcat.util.codec.binary package 
completely. I'll take a look. If it is possible then the plan would be 
remove in 11.0.x and deprecate in 10.1.x and earlier just in case 
someone is using the Tomcat internals directly.


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: APPROVE MY ICLA

2024-04-15 Thread Koteswararao Gundapaneni 
Thanx for sharing the policy document with me

On Mon, 15 Apr 2024, 09:21 Han Li,  wrote:

> Please read this document[1] carefully, how to become a committer.
>
> Again, there is no thread about inviting you to become a committer, so you
> don't have to sign ICLA, so please don't spam us like this again.
>
> Han
>
> [1] https://community.apache.org/newcommitter.html#new-committer-process
>
> > On Apr 15, 2024, at 10:05, Koteswararao Gundapaneni <
> apache.tomcat.k...@gmail.com> wrote:
> >
> > Please approve my request
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 68890] Several JSPs in the manage application have contradicting encoding

2024-04-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68890

--- Comment #1 from Michael Osipov  ---
As far as I understand they should not contain an XML prolog at all since they
aren't JSPX

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org