Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug 359309] resolve include and forward issues related to resource handler

This commit is contained in:
Jesse McConnell 2011-09-28 18:30:20 -05:00
parent 45e6cfa790
commit 7ecea5afd0
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
View File

@ -293,28 +293,28 @@ public class ResourceHandler extends AbstractHandler
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
protected Resource getResource(HttpServletRequest request) throws MalformedURLException protected Resource getResource(HttpServletRequest request) throws MalformedURLException
{ {
String servletPath;
String pathInfo; String pathInfo;
Boolean included = request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI) != null; Boolean included = request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI) != null;
if (included != null && included.booleanValue()) if (included != null && included.booleanValue())
{ {
servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH); /*
On an include there is no servletPath, nor do we want to look for one
as the resource handler is outside of the servlet contexts so there is
no special servlet handler that manages this value.
we expect a null in Dispatcher.INCLUDE_SERVLET_PATH
String servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH);
assert servletPath == null;
*/
pathInfo = (String)request.getAttribute(Dispatcher.INCLUDE_PATH_INFO); pathInfo = (String)request.getAttribute(Dispatcher.INCLUDE_PATH_INFO);
if (servletPath == null)
{
servletPath = request.getServletPath();
pathInfo = request.getPathInfo();
}
} }
else else
{ {
included = Boolean.FALSE; included = Boolean.FALSE;
servletPath = request.getServletPath();
pathInfo = request.getPathInfo(); pathInfo = request.getPathInfo();
} }
String pathInContext=URIUtil.addPaths(servletPath,pathInfo); return getResource(pathInfo);
return getResource(pathInContext);
} }

2
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
View File

@ -204,7 +204,6 @@ public class DispatcherTest
} }
@Test @Test
@Ignore("failing")
public void testIncludeToResourceHandler() throws Exception public void testIncludeToResourceHandler() throws Exception
{ {
_contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*"); _contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*");
@ -230,7 +229,6 @@ public class DispatcherTest
} }
@Test @Test
@Ignore("failing")
public void testWrappedIncludeToResourceHandler() throws Exception public void testWrappedIncludeToResourceHandler() throws Exception
{ {
_contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*"); _contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*");