25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From d63695a656f04e39bd1ad4dee0f2339b0e3b898f Mon Sep 17 00:00:00 2001
|
|
From: Mark Thomas <markt@apache.org>
|
|
Date: Wed, 3 Oct 2018 11:16:07 +0000
|
|
Subject: [PATCH] Ensure that a canonical path is always used for the docBase
|
|
of a Context to ensure consistent behaviour.
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1842702 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
java/org/apache/catalina/startup/ContextConfig.java | 2 +-
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
|
|
index be74f29168..f3935038fc 100644
|
|
--- a/java/org/apache/catalina/startup/ContextConfig.java
|
|
+++ b/java/org/apache/catalina/startup/ContextConfig.java
|
|
@@ -579,7 +579,7 @@ protected void fixDocBase() throws IOException {
|
|
|
|
File file = new File(docBase);
|
|
if (!file.isAbsolute()) {
|
|
- docBase = (new File(appBase, docBase)).getPath();
|
|
+ docBase = (new File(appBase, docBase)).getCanonicalPath();
|
|
} else {
|
|
docBase = file.getCanonicalPath();
|
|
}
|