This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 08a6cde95e Silently ignore rather than warn for known, unsupported
HTTP/2 settings
08a6cde95e is described below
commit 08a6cde95ecca1e2062dc78274bf30ebab6a8266
Author: Mark Thomas <[email protected]>
AuthorDate: Sun Dec 15 15:07:12 2024 +0000
Silently ignore rather than warn for known, unsupported HTTP/2 settings
---
java/org/apache/coyote/http2/ConnectionSettingsBase.java | 4 ++++
java/org/apache/coyote/http2/Setting.java | 8 ++++++++
webapps/docs/changelog.xml | 8 ++++++++
3 files changed, 20 insertions(+)
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
index b1d15c4d37..0b702bf5b5 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -92,6 +92,10 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
case NO_RFC7540_PRIORITIES:
validateNoRfc7540Priorities(value);
break;
+ case ENABLE_CONNECT_PROTOCOL:
+ case TLS_RENEG_PERMITTED:
+ // Not supported. Ignore it.
+ return;
case UNKNOWN:
// Unrecognised. Ignore it.
return;
diff --git a/java/org/apache/coyote/http2/Setting.java
b/java/org/apache/coyote/http2/Setting.java
index bf702024b5..cd86c09296 100644
--- a/java/org/apache/coyote/http2/Setting.java
+++ b/java/org/apache/coyote/http2/Setting.java
@@ -23,7 +23,9 @@ enum Setting {
INITIAL_WINDOW_SIZE(4),
MAX_FRAME_SIZE(5),
MAX_HEADER_LIST_SIZE(6),
+ ENABLE_CONNECT_PROTOCOL(8),
NO_RFC7540_PRIORITIES(9),
+ TLS_RENEG_PERMITTED(10),
UNKNOWN(Integer.MAX_VALUE);
private final int id;
@@ -61,9 +63,15 @@ enum Setting {
case 6: {
return MAX_HEADER_LIST_SIZE;
}
+ case 8: {
+ return ENABLE_CONNECT_PROTOCOL;
+ }
case 9: {
return NO_RFC7540_PRIORITIES;
}
+ case 10: {
+ return TLS_RENEG_PERMITTED;
+ }
default: {
return UNKNOWN;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0395afe34a..1be5e1afa2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,14 @@
</update>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Don't log warnings for registered HTTP/2 settings that Tomcat does not
+ support. These settings are now silently ignored. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.2 (markt)" rtext="2024-12-09">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
