6
0
forked from pool/tomcat10
Files
tomcat10/tomcat-jdt.patch

47 lines
3.2 KiB
Diff
Raw Permalink Normal View History

Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
--- apache-tomcat-10.1.34-src/java/org/apache/jasper/compiler/JDTCompiler.java 2025-01-03 18:40:16.470885660 +0000
+++ apache-tomcat-10.1.34-src/java/org/apache/jasper/compiler/JDTCompiler.java 2024-12-05 16:01:16.000000000 +0000
@@ -298,13 +298,13 @@
} else if (opt.equals("15")) {
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("16")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
+ settings.put(CompilerOptions.OPTION_Source, "16");
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("17")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
+ settings.put(CompilerOptions.OPTION_Source, "17");
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("18")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_18);
+ settings.put(CompilerOptions.OPTION_Source, "18");
} else if (opt.equals("19")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_19);
+ settings.put(CompilerOptions.OPTION_Source, "19");
} else if (opt.equals("20")) {
// Constant not available in latest ECJ version that runs on
// Java 11.
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
@@ -386,17 +386,17 @@
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("16")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
+ settings.put(CompilerOptions.OPTION_Compliance, "16");
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("17")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_17);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
+ settings.put(CompilerOptions.OPTION_Compliance, "17");
Accepting request 1234785 from home:RMestre:branches:Java:packages - Update to Tomcat 10.1.34 * Fixed CVEs: + CVE-2024-54677: DoS in examples web application (bsc#1233434) + CVE-2024-50379: RCE due to TOCTOU issue in JSP compilation (bsc#1234663) * Catalina + Add: Add option to serve resources from subpath only with WebDAV Servlet like with DefaultServlet. (michaelo) + Fix: Add special handling for the protocols attribute of SSLHostConfig in storeconfig. (remm) + Fix: 69442: Fix case sensitive check on content-type when parsing request parameters. (remm) + Code: Refactor duplicate code for extracting media type and subtype from content-type into a single method. (markt) + Fix: Compatibility of generated embedded code with components where constructors or property related methods throw a checked exception. (remm) + Fix: The previous fix for inconsistent resource metadata during concurrent reads and writes was incomplete. (markt) + Fix: #780: Fix content-range header length. Submitted by Chenjp. (remm) + Fix: 69444: Ensure that the jakarta.servlet.error.message request attribute is set when an application defined error page is called. (markt) + Fix: Avoid quotes for numeric values in the JSON generated by the status servlet. (remm) + Add: Add strong ETag support for the WebDAV and default servlet, which can be enabled by using the useStrongETags init parameter with a value set to true. The ETag generated will be a SHA-1 checksum of the resource content. (remm) + Fix: Use client locale for directory listings. (remm) + Fix: 69439: Improve the handling of multiple Cache-Control headers in the ExpiresFilter. Based on pull request #777 by Chenjp. (markt) + Fix: 69447: Update the support for caching classes the web application OBS-URL: https://build.opensuse.org/request/show/1234785 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=53
2025-01-06 16:19:58 +00:00
} else if (opt.equals("18")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_18);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_18);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
+ settings.put(CompilerOptions.OPTION_Compliance, "18");
} else if (opt.equals("19")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_19);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_19);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
+ settings.put(CompilerOptions.OPTION_Compliance, "19");
} else if (opt.equals("20")) {
// Constant not available in latest ECJ version that runs on
// Java 11.