This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6d9cb126fc4b6a2af250beec8317e18f107d990f Merge: 87430e860f fe4614d77c Author: remm <[email protected]> AuthorDate: Thu Nov 5 23:56:38 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main java/org/apache/coyote/CompressionConfig.java | 6 + java/org/apache/coyote/http2/FrameType.java | 2 +- .../apache/jasper/compiler/ParserController.java | 69 ++-- java/org/apache/jasper/compiler/SmapUtil.java | 193 ++++++++++- java/org/apache/jasper/compiler/Validator.java | 6 +- .../jasper/resources/LocalStrings.properties | 1 + .../tomcat/websocket/server/UpgradeUtil.java | 4 + .../apache/tomcat/jdbc/pool/PooledConnection.java | 212 ++++++------ .../TestCompressionConfigPartialContent.java | 134 ++++++++ .../apache/coyote/http2/TestHttp2Section_6_4.java | 7 +- .../jasper/compiler/TestParserController.java | 128 ++++++- test/org/apache/jasper/compiler/TestSmapUtil.java | 375 ++++++++++++++++++--- .../server/TestUpgradeRequiredResponse.java | 73 ++++ 13 files changed, 1011 insertions(+), 199 deletions(-) diff --cc modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java index cdc8337932,4cb92d0e2e..f768887aed --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java @@@ -1491,13 -1474,12 +1482,19 @@@ public class PooledConnection implement } /** ++<<<<<<< HEAD + * Returns the timestamp at which the last successful validation completed on the current physical session. While + * the session has not been validated it reports 0, so a validation inherited from the session a reconnect replaced + * cannot be mistaken for one of this session. Before any session has been established, it reports the time this + * pooled connection was created. ++======= + * Returns the timestamp at which the last successful validation completed. Until a validation has completed for the + * first time, this is the time this pooled connection was created - which on a pool with no validation configured + * is the value the attribute keeps. ++>>>>>>> branch 'main' of [email protected]:apache/tomcat.git * * @return the timestamp at which the last successful validation completed as defined by - * {@link System#currentTimeMillis()} + * {@link System#currentTimeMillis()}, or 0 while the current session has not been validated */ @Override public long getLastValidated() { @@@ -1645,13 -1615,12 +1638,20 @@@ } /** ++<<<<<<< HEAD + * Returns a diagnostic rendering of this pooled connection that is safe to interpolate into a pool log message: + * the connection's identity and whether it currently holds a physical session, never the driver's own + * {@link java.sql.Connection}'s own {@code toString()}. That text is unmasked and may carry the URL, the user or other session details, + * and it may contain newlines, so passing it into a pool warning could expose a credential or forge log lines. A + * caller that wants the driver's text for an explicit dump can read the physical connection itself. ++======= + * Returns a diagnostic rendering of this pooled connection: the driver's own {@link java.sql.Connection#toString()} + * when a physical session is present, or {@code null}. The driver's text is not masked and may include the URL, the + * user or other session details, so pool warnings that pass a pooled connection should treat it as best-effort + * diagnostic output rather than as a credential-safe view. ++>>>>>>> branch 'main' of [email protected]:apache/tomcat.git * - * @return the diagnostic rendering + * @return the credential-safe diagnostic rendering */ @Override public String toString() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
