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
commit 9ce58fd70bc5d8b7cbcff06b6bc07b718ded47b1 Author: Mark Thomas <[email protected]> AuthorDate: Wed Dec 8 17:06:56 2021 +0000 Remove DISABLE_BUILTIN_EXTENSIONS as it is no longer required The TCK will be updated to account for any potential container provided extensions appearing in the installed extension list. --- java/org/apache/tomcat/websocket/Constants.java | 19 +++---------------- webapps/docs/changelog.xml | 5 +++++ webapps/docs/config/systemprops.xml | 6 ------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/java/org/apache/tomcat/websocket/Constants.java b/java/org/apache/tomcat/websocket/Constants.java index 6ecdc48..0c4e21b 100644 --- a/java/org/apache/tomcat/websocket/Constants.java +++ b/java/org/apache/tomcat/websocket/Constants.java @@ -128,28 +128,15 @@ public class Constants { public static final String WS_AUTHENTICATION_USER_NAME = "org.apache.tomcat.websocket.WS_AUTHENTICATION_USER_NAME"; public static final String WS_AUTHENTICATION_PASSWORD = "org.apache.tomcat.websocket.WS_AUTHENTICATION_PASSWORD"; - /* Configuration for extensions - * Note: These options are primarily present to enable this implementation - * to pass compliance tests. They are expected to be removed once - * the WebSocket API includes a mechanism for adding custom extensions - * and disabling built-in extensions. - */ - static final boolean DISABLE_BUILTIN_EXTENSIONS = - Boolean.getBoolean("org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS"); - public static final boolean STRICT_SPEC_COMPLIANCE = Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE"); public static final List<Extension> INSTALLED_EXTENSIONS; static { - if (DISABLE_BUILTIN_EXTENSIONS) { - INSTALLED_EXTENSIONS = Collections.unmodifiableList(new ArrayList<>()); - } else { - List<Extension> installed = new ArrayList<>(1); - installed.add(new WsExtension("permessage-deflate")); - INSTALLED_EXTENSIONS = Collections.unmodifiableList(installed); - } + List<Extension> installed = new ArrayList<>(1); + installed.add(new WsExtension("permessage-deflate")); + INSTALLED_EXTENSIONS = Collections.unmodifiableList(installed); } private Constants() { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 942a5b5..e7ab2d7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -141,6 +141,11 @@ extension can just be excluded from the result of the negotiation. (markt) </fix> + <fix> + Remove the <code>DISABLE_BUILTIN_EXTENSIONS</code>. It was added to + enable Tomcat to pass the WebSocket TCK but after updates to the TCK, it + is no longer required. (markt) + </fix> </changelog> </subsection> </section> diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml index 392a302..690463c 100644 --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml @@ -277,12 +277,6 @@ seconds.</p> </property> - <property name="org.apache.tomcat. websocket.DISABLE_BUILTIN_EXTENSIONS"> - <p>If <code>true</code>, disable all built-in extensions provided by the - server, such as message compression.</p> - <p>The default value is <code>false</code>.</p> - </property> - </properties> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
