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 808cebd68c19692fa1f4190fe922b2080ebaeccb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 31 16:12:05 2024 +0100
Fix BZ 69234 - fix regression - URL->URI refactor broke parallel deploy
https://bz.apache.org/bugzilla/show_bug.cgi?id=69234
---
java/org/apache/tomcat/util/buf/UriUtil.java | 3 ++-
webapps/docs/changelog.xml | 9 +++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/UriUtil.java
b/java/org/apache/tomcat/util/buf/UriUtil.java
index a86292128f..29e80d3453 100644
--- a/java/org/apache/tomcat/util/buf/UriUtil.java
+++ b/java/org/apache/tomcat/util/buf/UriUtil.java
@@ -128,7 +128,8 @@ public final class UriUtil {
}
URI uri;
try {
- uri = new URI("jar", sb.toString(), null);
+ // Have to use the single argument constructor as that is the only
one that doesn't escape input.
+ uri = new URI("jar:" + sb.toString());
} catch (URISyntaxException e) {
throw new IOException(e);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0ec2846316..68ff622d86 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 11.0.0-M24 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>69234</bug>: Fix a regression caused by the refactoring to use
+ <code>java.net.URI</code> rather than <code>java.net.URL</code> that
+ broke support for parallel deployment with WAR files. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.0-M23 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
