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

fix use of canonicalPath after #8343 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2022-07-27 11:29:12 +10:00
parent f81bdc9711
commit e6db23afc5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -670,7 +670,7 @@ public class ContextHandler extends Handler.Wrapper implements Attributes, Grace
{
if (isStarted())
throw new IllegalStateException(getState());
_contextPath = URIUtil.normalizePath(contextPath);
_contextPath = URIUtil.canonicalPath(contextPath);
}
/**

4
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
View File

@ -775,7 +775,7 @@ public class ServletHandler extends Handler.Wrapper
ServletMapping mapping = new ServletMapping();
mapping.setServletName(servlet.getName());
mapping.setPathSpec(URIUtil.normalizePath(pathSpec));
mapping.setPathSpec(URIUtil.canonicalPath(pathSpec));
setServletMappings(ArrayUtil.addToArray(getServletMappings(), mapping, ServletMapping.class));
}
catch (RuntimeException e)
@ -887,7 +887,7 @@ public class ServletHandler extends Handler.Wrapper
FilterMapping mapping = new FilterMapping();
mapping.setFilterName(holder.getName());
mapping.setPathSpec(URIUtil.normalizePath(pathSpec));
mapping.setPathSpec(URIUtil.canonicalPath(pathSpec));
mapping.setDispatcherTypes(dispatches);
addFilterMapping(mapping);
}