From 438e7bb2fcbac61736c804e3d02f519c406c6936 Mon Sep 17 00:00:00 2001 From: timw Date: Wed, 6 Oct 2010 07:22:46 +0000 Subject: [PATCH] More fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 Calculating complete resource path when accessed via RequestDispatcher.include() git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004912 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/servlets/DefaultServlet.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index 30af597fe..2ce3a3e57 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -348,21 +348,24 @@ public class DefaultServlet if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) { String result = (String) request.getAttribute( Globals.INCLUDE_PATH_INFO_ATTR); - if (result == null) + if (result == null) { result = (String) request.getAttribute( Globals.INCLUDE_SERVLET_PATH_ATTR); - if ((result == null) || (result.equals(""))) + } else { + result = (String) request.getAttribute( + Globals.INCLUDE_SERVLET_PATH_ATTR) + result; + } + if ((result == null) || (result.equals(""))) { result = "/"; + } return (result); } // No, extract the desired path directly from the request String result = request.getPathInfo(); if (result == null) { - // Mapped to '/' result = request.getServletPath(); } else { - // Mapped to '/path/*' so get entire path under context result = request.getServletPath() + result; } if ((result == null) || (result.equals(""))) { -- 2.11.0