Merge branch '6.2' of https://github.com/lucee/Lucee into 6.2

lucee · Dec 23, 2024 · 9539486 · 9539486
2 parents 9f0bed0 + 89f0905
commit 9539486
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/MappingImpl.java b/core/src/main/java/lucee/runtime/MappingImpl.java
@@ -38,6 +38,7 @@
 import lucee.commons.io.log.Log;
 import lucee.commons.io.log.LogUtil;
 import lucee.commons.io.res.Resource;
+import lucee.commons.io.res.util.ResourceUtil;
 import lucee.commons.lang.ClassUtil;
 import lucee.commons.lang.ExceptionUtil;
 import lucee.commons.lang.MappingUtil;
@@ -448,7 +449,7 @@ public PageSource getPageSource(String realPath) {
 			else if (realPath.startsWith("./")) {
 				realPath = realPath.substring(1);
 			}
-			else {
+			else if (!ResourceUtil.isWindowsPath(realPath)){
 				realPath = "/" + realPath;
 			}
 		}
@@ -466,7 +467,7 @@ public Resource getResource(String realPath) {
 			else if (realPath.startsWith("./")) {
 				realPath = realPath.substring(1);
 			}
-			else {
+			else if (!ResourceUtil.isWindowsPath(realPath)){
 				realPath = "/" + realPath;
 			}
 		}