date:20230523

svn commit: r1910013 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2023-05-23 Thread markt

Author: markt
Date: Tue May 23 07:09:45 2023
New Revision: 1910013

URL: http://svn.apache.org/viewvc?rev=1910013&view=rev
Log:
Fix typo

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1910013&r1=1910012&r2=1910013&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue May 23 07:09:45 2023
@@ -36,7 +36,7 @@ project logo are trademarks of the Apach
 
 2023-05-19 Tomcat 10.1.9 Released
 
-The Apache Tomcat Project is proud to announce the release of version 10.1.8
+The Apache Tomcat Project is proud to announce the release of version 10.1.9
 of Apache Tomcat. This release implements specifications that are part of the
 Jakarta EE 10 platform.
 Applications that run on Tomcat 9 and earlier will not run on Tomcat 10

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1910013&r1=1910012&r2=1910013&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue May 23 07:09:45 2023
@@ -57,7 +57,7 @@ project logo are trademarks of the Apach
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 10.1.8
+The Apache Tomcat Project is proud to announce the release of version 10.1.9
 of Apache Tomcat. This release implements specifications that are part of the
 Jakarta EE 10 platform.
 Applications that run on Tomcat 9 and earlier will not run on Tomcat 10



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

[tomcat] branch main updated: Code clean-up. Formatting. No functional change.

2023-05-23 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 63461b3bed Code clean-up. Formatting. No functional change.
63461b3bed is described below

commit 63461b3bed4d837d435afe4b72f05a370fd83f44
Author: Mark Thomas 
AuthorDate: Tue May 23 11:23:09 2023 +0100

Code clean-up. Formatting. No functional change.
---
 .../catalina/authenticator/AuthenticatorBase.java  |  12 +--
 .../authenticator/DigestAuthenticator.java |  25 ++---
 .../catalina/authenticator/SavedRequest.java   |   2 +-
 .../catalina/authenticator/SingleSignOn.java   |   2 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   6 +-
 .../jaspic/AuthConfigFactoryImpl.java  | 107 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  11 +--
 .../authenticator/jaspic/MessageInfoImpl.java  |  10 +-
 .../jaspic/PersistentProviderRegistrations.java|  34 ---
 .../jaspic/SimpleAuthConfigProvider.java   |  18 ++--
 .../jaspic/SimpleServerAuthConfig.java |  17 ++--
 .../jaspic/SimpleServerAuthContext.java|  14 ++-
 12 files changed, 118 insertions(+), 140 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e53ffc7297..352f984c79 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -612,8 +612,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 String originHeader = 
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
 if (originHeader != null && !originHeader.isEmpty() && 
RequestUtil.isValidOrigin(originHeader) &&
 !RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
 if (accessControlRequestMethodHeader != null && 
!accessControlRequestMethodHeader.isEmpty()) {
 // This appears to be a CORS Preflight request
 if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -699,8 +699,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 
 try {
 CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
 jaspicState.serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 } catch (AuthException e) {
@@ -1171,8 +1171,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 if (client != null) {
 ServerAuthContext serverAuthContext;
 try {
-ServerAuthConfig serverAuthConfig = 
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, getCallbackHandler());
 String authContextID = 
serverAuthConfig.getAuthContextID(messageInfo);
 serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index 065efce308..399ffa8da4 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -68,7 +68,7 @@ public class DigestAuthenticator extends AuthenticatorBase {
 private static final String NONCE_DIGEST = "SHA-256";
 
 // List permitted algorithms and maps them to Java standard names
-private static final Map PERMITTED_ALGORITHMS = new 
HashMap<>();
+private static final Map PERMITTED_ALGORITHMS = new 
HashMap<>();
 static {
 // Allows the digester to be configured with either the Standard Java 
name or the name

[tomcat] branch 10.1.x updated: Code clean-up. Formatting. No functional change.

2023-05-23 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 d63d73730e Code clean-up. Formatting. No functional change.
d63d73730e is described below

commit d63d73730ecc789aff792afbeaea5963ef4b7319
Author: Mark Thomas 
AuthorDate: Tue May 23 11:23:14 2023 +0100

Code clean-up. Formatting. No functional change.
---
 .../catalina/authenticator/AuthenticatorBase.java  |  12 +--
 .../authenticator/DigestAuthenticator.java |  25 ++---
 .../catalina/authenticator/SavedRequest.java   |   2 +-
 .../catalina/authenticator/SingleSignOn.java   |   2 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   6 +-
 .../authenticator/SpnegoAuthenticator.java |   2 +-
 .../jaspic/AuthConfigFactoryImpl.java  | 107 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  11 +--
 .../authenticator/jaspic/MessageInfoImpl.java  |  10 +-
 .../jaspic/PersistentProviderRegistrations.java|  34 ---
 .../jaspic/SimpleAuthConfigProvider.java   |  18 ++--
 .../jaspic/SimpleServerAuthConfig.java |  17 ++--
 .../jaspic/SimpleServerAuthContext.java|  14 ++-
 13 files changed, 119 insertions(+), 141 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e53ffc7297..352f984c79 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -612,8 +612,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 String originHeader = 
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
 if (originHeader != null && !originHeader.isEmpty() && 
RequestUtil.isValidOrigin(originHeader) &&
 !RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
 if (accessControlRequestMethodHeader != null && 
!accessControlRequestMethodHeader.isEmpty()) {
 // This appears to be a CORS Preflight request
 if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -699,8 +699,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 
 try {
 CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
 jaspicState.serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 } catch (AuthException e) {
@@ -1171,8 +1171,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 if (client != null) {
 ServerAuthContext serverAuthContext;
 try {
-ServerAuthConfig serverAuthConfig = 
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, getCallbackHandler());
 String authContextID = 
serverAuthConfig.getAuthContextID(messageInfo);
 serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index d65eda065d..4df6d12e06 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -68,7 +68,7 @@ public class DigestAuthenticator extends AuthenticatorBase {
 private static final String NONCE_DIGEST = "SHA-256";
 
 // List permitted algorithms and maps them to Java standard names
-private static final Map PERMITTED_ALGORITHMS = new 
HashMap<>();
+private static final Map PERMITTED_ALGORITHMS = new 
HashMap<>();
 static {
 // Allows the digester

[tomcat] branch 9.0.x updated: Code clean-up. Formatting. No functional change.

2023-05-23 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt 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 5f7a833a77 Code clean-up. Formatting. No functional change.
5f7a833a77 is described below

commit 5f7a833a77d527f0c9d2c6d8052e5f319abbd643
Author: Mark Thomas 
AuthorDate: Tue May 23 11:23:32 2023 +0100

Code clean-up. Formatting. No functional change.
---
 .../catalina/authenticator/AuthenticatorBase.java  |  12 +--
 .../apache/catalina/authenticator/Constants.java   |   4 +-
 .../authenticator/DigestAuthenticator.java |  27 +++---
 .../catalina/authenticator/SavedRequest.java   |   2 +-
 .../catalina/authenticator/SingleSignOn.java   |   2 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   6 +-
 .../authenticator/SpnegoAuthenticator.java |   2 +-
 .../jaspic/AuthConfigFactoryImpl.java  | 104 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  11 +--
 .../authenticator/jaspic/MessageInfoImpl.java  |  10 +-
 .../jaspic/PersistentProviderRegistrations.java|  34 +++
 .../jaspic/SimpleAuthConfigProvider.java   |  18 ++--
 .../jaspic/SimpleServerAuthConfig.java |  19 ++--
 .../jaspic/SimpleServerAuthContext.java|  14 ++-
 14 files changed, 120 insertions(+), 145 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 2dbaa7c312..cecf8347e4 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -611,8 +611,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 String originHeader = 
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
 if (originHeader != null && !originHeader.isEmpty() && 
RequestUtil.isValidOrigin(originHeader) &&
 !RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
 if (accessControlRequestMethodHeader != null && 
!accessControlRequestMethodHeader.isEmpty()) {
 // This appears to be a CORS Preflight request
 if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -698,8 +698,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 
 try {
 CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
 jaspicState.serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 } catch (AuthException e) {
@@ -1170,8 +1170,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 if (client != null) {
 ServerAuthContext serverAuthContext;
 try {
-ServerAuthConfig serverAuthConfig = 
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, getCallbackHandler());
 String authContextID = 
serverAuthConfig.getAuthContextID(messageInfo);
 serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index 983528a9d4..43d2de6a13 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -35,8 +35,8 @@ public class Constants {
 public static final String DEFAULT_LOGIN_MODULE_NAME = 
"com.sun.security.jgss.krb5.accept";
 
 // Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE = System
-
.getProperty("org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
 "JSESSIONIDSSO");
+pub

[tomcat] 01/02: Code clean-up. Formatting. No functional change.

2023-05-23 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 55c8468456ff228dab91cb021365826acdc57373
Author: Mark Thomas 
AuthorDate: Tue May 23 11:23:54 2023 +0100

Code clean-up. Formatting. No functional change.
---
 .../catalina/authenticator/AuthenticatorBase.java  |  12 +--
 .../apache/catalina/authenticator/Constants.java   |   4 +-
 .../authenticator/DigestAuthenticator.java |  36 +++
 .../catalina/authenticator/SavedRequest.java   |   2 +-
 .../catalina/authenticator/SingleSignOn.java   |   2 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   6 +-
 .../authenticator/SpnegoAuthenticator.java |   2 +-
 .../jaspic/AuthConfigFactoryImpl.java  | 104 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  11 +--
 .../authenticator/jaspic/MessageInfoImpl.java  |  10 +-
 .../jaspic/PersistentProviderRegistrations.java|  30 +++---
 .../jaspic/SimpleAuthConfigProvider.java   |  18 ++--
 .../jaspic/SimpleServerAuthConfig.java |  19 ++--
 .../jaspic/SimpleServerAuthContext.java|  14 ++-
 14 files changed, 122 insertions(+), 148 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e25174750f..af045ae94d 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -613,8 +613,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 String originHeader = 
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
 if (originHeader != null && !originHeader.isEmpty() && 
RequestUtil.isValidOrigin(originHeader) &&
 !RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
 if (accessControlRequestMethodHeader != null && 
!accessControlRequestMethodHeader.isEmpty()) {
 // This appears to be a CORS Preflight request
 if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -700,8 +700,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 
 try {
 CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
 jaspicState.serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 } catch (AuthException e) {
@@ -1172,8 +1172,8 @@ public abstract class AuthenticatorBase extends ValveBase 
implements Authenticat
 if (client != null) {
 ServerAuthContext serverAuthContext;
 try {
-ServerAuthConfig serverAuthConfig = 
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet", 
jaspicAppContextID, getCallbackHandler());
 String authContextID = 
serverAuthConfig.getAuthContextID(messageInfo);
 serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index 623bf3cecb..0fa2af7cc1 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -41,8 +41,8 @@ public class Constants {
 public static final String USE_SUBJECT_CREDS_ONLY_PROPERTY = 
"javax.security.auth.useSubjectCredsOnly";
 
 // Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE = System
-
.getProperty("org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
 "JSESSIONIDSSO");
+public static final String SINGLE_SIGN_ON_COOKIE =
+
System.getProperty("org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
 "JSES

[tomcat] 02/02: Align with 9.0.x and 10.1.x

2023-05-23 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit cc8eb4e1ef4846e6d970f493aa196b87df8d1290
Author: Mark Thomas 
AuthorDate: Tue May 23 11:39:03 2023 +0100

Align with 9.0.x and 10.1.x
---
 java/org/apache/catalina/authenticator/Constants.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index 0fa2af7cc1..f6d836915b 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -17,7 +17,6 @@
 package org.apache.catalina.authenticator;
 
 public class Constants {
-
 // Authentication methods for login configuration
 // Servlet spec schemes are defined in HttpServletRequest
 // Vendor specific schemes


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

[tomcat] branch 8.5.x updated (46d81a2019 -> cc8eb4e1ef)

2023-05-23 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


from 46d81a2019 Additional false positives
 new 55c8468456 Code clean-up. Formatting. No functional change.
 new cc8eb4e1ef Align with 9.0.x and 10.1.x

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:
 .../catalina/authenticator/AuthenticatorBase.java  |  12 +--
 .../apache/catalina/authenticator/Constants.java   |   5 +-
 .../authenticator/DigestAuthenticator.java |  36 +++
 .../catalina/authenticator/SavedRequest.java   |   2 +-
 .../catalina/authenticator/SingleSignOn.java   |   2 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   6 +-
 .../authenticator/SpnegoAuthenticator.java |   2 +-
 .../jaspic/AuthConfigFactoryImpl.java  | 104 +
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  11 +--
 .../authenticator/jaspic/MessageInfoImpl.java  |  10 +-
 .../jaspic/PersistentProviderRegistrations.java|  30 +++---
 .../jaspic/SimpleAuthConfigProvider.java   |  18 ++--
 .../jaspic/SimpleServerAuthConfig.java |  19 ++--
 .../jaspic/SimpleServerAuthContext.java|  14 ++-
 14 files changed, 122 insertions(+), 149 deletions(-)


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

RFC 9113 (HTTP/2) and HTTP upgrade to h2c

2023-05-23 Thread Mark Thomas


Hi all,

The latest HTTP/2 RFC (9113, June 2022) deprecates the use of HTTP 
upgrade to start an HTTP/2 clear text connection.


Interestingly, a range of vocabulary is used. Section 3.1 says it is 
"deprecated". Section 11.2 says it is "obsolete" and that "This 
capability has been removed.".


Given all the above, I did wonder about removing HTTP upgrade to h2c 
support from Tomcat 11.0.x.


The benefits of removing HTTP upgrade to h2c support are:
- Marginally less code (but we still need to retain support for the
  generic HTTP upgrade mechanism).

The disadvantages are:
- A lot of the HTTP/2 tests use h2c via HTTP upgrade and would need to
  be refactored. Most likely to use prior knowledge.
- Anyone currently relying on his feature (assumed to be a small number
  of users) would need to find a different solution.

Overall, continuing to support HTTP upgrade to h2c for Tomcat 11.0.x 
looks to be the best option. The costs of removing it are much greater 
than the benefits that would achieve and I don't see any risks 
associated with retaining the support.


Thoughts?

Mark

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

Buildbot failure in on tomcat-8.5.x

2023-05-23 Thread buildbot

Build status: BUILD FAILED: failed Snapshot deployed to ASF Maven snapshot 
repository (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/36/builds/497
Blamelist: Mark Thomas 
Build Text: failed Snapshot deployed to ASF Maven snapshot repository (failure)
Status Detected: new failure
Build Source Stamp: [branch 8.5.x] cc8eb4e1ef4846e6d970f493aa196b87df8d1290


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 2


-- ASF Buildbot


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

Panama support in Tomcat 11 (take 2)

2023-05-23 Thread Rémy Maucherat

Hi,

Taking into account the feedback I got, here is the plan for using
Panama in Tomcat:
- No official support for Panama preview APIs (from 17 or 21). For
these two, I will leave the sources in "modules". Users should be able
to build the support fairly easily.
- Once Panama is non preview (this may be delayed again, so maybe not
in Java 22), I will add support for it in the main source tree. The
main javac call that will keep on using --release 21 will exclude
these new classes. There will be a new javac call using --release 2X
to compile these, and these will then be packaged in a separate JAR.
As a result, when trying to use Panama on Java 21, there will also be
a simple class version error that is easy to understand.
- The minimum Java version to compile Tomcat 11 would then be updated
from 21 to 2X.
- Assuming 2X isn't too far away, this could be fully sorted out
before Tomcat 11 gets out of the milestone releases.

I considered other options, but (unsurprisingly) the --release flag
cannot be used to target past preview API versions (javac error on
Java 21 when trying: "preview language features are only supported for
release 21"). So any other plan would require multiple Java versions
to build Tomcat 11 and would likely be unsustainable long term.

On other news, Java 21 (with Panama preview) seems to be going along
just fine, eta in September.

Any further comments ?

Rémy

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

Re: [tomcat] branch main updated: Clear SocketWrapper reference to help GC

2023-05-23 Thread Christopher Schultz


Han,

On 5/20/23 21:42, Han Li wrote:




On May 21, 2023, at 01:19, Mark Thomas  wrote:

On 19/05/2023 04:24, li...@apache.org  wrote:

This is an automated email from the ASF dual-hosted git repository.
lihan 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 10492dd22b Clear SocketWrapper reference to help GC
10492dd22b is described below
commit 10492dd22bd64ff63cf77786fa67d45cdc2a54b3
Author: lihan mailto:li...@apache.org>>
AuthorDate: Fri May 19 11:24:27 2023 +0800
Clear SocketWrapper reference to help GC


-1. Veto.


---
java/org/apache/coyote/AbstractProcessor.java | 3 +++
java/org/apache/coyote/http11/Http11Processor.java | 1 -
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-


The above changes need to be reverted since they break AJP connections. The AJP 
processor is recycled after CPING MESSAGES and expects processing to continue 
afterwards. Setting the SocketWrapper to null triggers NPEs when trying to 
process the request that follows the CPING.


Sigh, I indeed forgot to test the AJP processor.

Have reverted, thanks for the review.


This could be fixed by dropping the AJP connector in Tomcat 11.x :)

-chris

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

[Bug 66613] New: Developing wiki page: Unclear reference to "service wrapper" in Debugging

2023-05-23 Thread bugzilla

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

Bug ID: 66613
   Summary: Developing wiki page: Unclear reference to "service
wrapper" in Debugging
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: chea...@gmail.com
  Target Milestone: --

The "How do I configure Tomcat to support remote debugging?" section of the
Tomcat Developing FAQ at
https://cwiki.apache.org/confluence/display/TOMCAT/Developing?show-miniview#Developing-Debugging
contains the following item:

> If you run Tomcat using service wrapper, add the above JVM options before any 
> other JVM options. Check the documentation for the service wrapper to 
> determine how to set JVM options.

Please clarify what service wrapper is, either by adding text or adding a link
to relevant documentation.

-- 
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

[GitHub] [tomcat] alexkachanov opened a new pull request, #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread via GitHub



alexkachanov opened a new pull request, #621:
URL: https://github.com/apache/tomcat/pull/621

   * fix and junit test


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread via GitHub



alexkachanov commented on code in PR #621:
URL: https://github.com/apache/tomcat/pull/621#discussion_r1203192504


##
java/org/apache/catalina/util/URLEncoder.java:
##
@@ -40,6 +40,7 @@ public final class URLEncoder implements Cloneable {
 
 public static final URLEncoder DEFAULT = new URLEncoder();
 public static final URLEncoder QUERY = new URLEncoder();
+public static final URLEncoder XML = new URLEncoder();

Review Comment:
   added new XML encoder that encodes strings that are valid in XML



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread via GitHub



alexkachanov commented on code in PR #621:
URL: https://github.com/apache/tomcat/pull/621#discussion_r1203192773


##
java/org/apache/catalina/util/URLEncoder.java:
##
@@ -95,6 +96,8 @@ public final class URLEncoder implements Cloneable {
 QUERY.addSafeCharacter('_');
 QUERY.addSafeCharacter('=');
 QUERY.addSafeCharacter('&');
+
+XML.addSafeCharacter('/');

Review Comment:
   "/" is a valid symbol



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread via GitHub



alexkachanov commented on code in PR #621:
URL: https://github.com/apache/tomcat/pull/621#discussion_r1203195493


##
java/org/apache/catalina/servlets/DefaultServlet.java:
##
@@ -1650,7 +1654,7 @@ protected InputStream renderXml(HttpServletRequest 
request, String contextPath,
   .append('\'');
 sb.append(" urlPath='")
   .append(rewrittenContextPath)
-  .append(rewriteUrl(directoryWebappPath + entry))
+  .append(rewriteUrl(directoryWebappPath + entry, URLEncoder.XML))

Review Comment:
   using XML encoder to encode path attribute which may contain "'" and "&" 
symbols



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread via GitHub



alexkachanov commented on code in PR #621:
URL: https://github.com/apache/tomcat/pull/621#discussion_r1203195738


##
test/org/apache/catalina/servlets/TestDefaultServlet.java:
##
@@ -578,6 +578,44 @@ public void testBug57601() throws Exception {
 
 tomcat.stop();
 }
+
+@Test
+public void testBug66609() throws Exception {

Review Comment:
   added test to test the fix



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[Bug 66609] invalid XML in directory listing with file names containing "&" and "'"

2023-05-23 Thread bugzilla

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

--- Comment #4 from webmascon  ---
created pull request: https://github.com/apache/tomcat/pull/621

-- 
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 66613] Developing wiki page: Unclear reference to "service wrapper" in Debugging

2023-05-23 Thread bugzilla

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

--- Comment #1 from Han Li  ---
(In reply to Philippe Cloutier from comment #0)
> > If you run Tomcat using service wrapper, add the above JVM options before 
> > any other JVM options. Check the documentation for the service wrapper to 
> > determine how to set JVM options.
> 
> Please clarify what service wrapper is, either by adding text or adding a
> link to relevant documentation.

If I understand correctly, Tomcat uses Apache Commons Daemon as a wrapper
provider to install itself as a service on Windows, so `service wrapper` is
Apache Commons Daemon.

-- 
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

svn commit: r1910013 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[tomcat] branch main updated: Code clean-up. Formatting. No functional change.

[tomcat] branch 10.1.x updated: Code clean-up. Formatting. No functional change.

[tomcat] branch 9.0.x updated: Code clean-up. Formatting. No functional change.

[tomcat] 01/02: Code clean-up. Formatting. No functional change.

[tomcat] 02/02: Align with 9.0.x and 10.1.x

[tomcat] branch 8.5.x updated (46d81a2019 -> cc8eb4e1ef)

RFC 9113 (HTTP/2) and HTTP upgrade to h2c

Buildbot failure in on tomcat-8.5.x

Panama support in Tomcat 11 (take 2)

Re: [tomcat] branch main updated: Clear SocketWrapper reference to help GC

[Bug 66613] New: Developing wiki page: Unclear reference to "service wrapper" in Debugging

[GitHub] [tomcat] alexkachanov opened a new pull request, #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

[GitHub] [tomcat] alexkachanov commented on a diff in pull request #621: Bug 66609 - invalid XML in directory listing with file names containing "&" and "'"

[Bug 66609] invalid XML in directory listing with file names containing "&" and "'"

[Bug 66613] Developing wiki page: Unclear reference to "service wrapper" in Debugging

19 matches

Site Navigation

Mail list logo

Footer information