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
The following commit(s) were added to refs/heads/main by this push:
new 7610b9b482 Additional for BZ 68035 - allow use of bare (no path) WAR
or dir names
7610b9b482 is described below
commit 7610b9b48229cd7458ed81f92ce496ab9cb89317
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 12 12:25:11 2023 +0000
Additional for BZ 68035 - allow use of bare (no path) WAR or dir names
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035
---
java/org/apache/catalina/manager/ManagerServlet.java | 3 +++
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 13 insertions(+)
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index e0c087b587..8b458c6b09 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -952,6 +952,9 @@ public class ManagerServlet extends HttpServlet implements
ContainerServlet {
localWarFile = new File(host.getAppBaseFile(),
baseName);
}
File warFile = new File(war);
+ if (!warFile.isAbsolute()) {
+ warFile = new File(host.getAppBaseFile(), war);
+ }
// Skip delete and copy if source == destination
if
(!warFile.getCanonicalPath().equals(localWarFile.getCanonicalPath())) {
if (localWarFile.exists() &&
!ExpandWar.delete(localWarFile)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89f8534c98..cb874b2b86 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web Applications">
+ <changelog>
+ <fix>
+ <bug>68035</bug>: Additional fix to the Manager application to enable
+ the deployment of a web application located in a Host's
+ <code>appBase</code> where the web application is specified by a bare
+ (no path) WAR or directory name as shown in the documentation. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.0-M15 (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
