diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java index d56f08259..df672ad5d 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java @@ -77,7 +77,13 @@ public class ProxyServlet extends HttpServlet { return null; } String requestUri = HttpServletRequestWrapperImpl.getDispatchRequestURI(request); - return requestUri.substring(request.getContextPath().length() + request.getServletPath().length()); + String contextPath = request.getContextPath(); + String servletPath = request.getServletPath(); + if (request.getDispatcherType() == DispatcherType.INCLUDE) { + contextPath = (String)request.getAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH); + servletPath = (String)request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH); + } + return requestUri.substring(contextPath.length() + servletPath.length()); } /** |