root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Correctly determine HttpServletMapping for INCLUDE 

Closes gh-26216
This commit is contained in:
Rossen Stoyanchev 2020-12-07 17:44:22 +00:00
parent 0172424635
commit 7ef3257b03
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
View File

@ -21,6 +21,7 @@ import java.nio.charset.UnsupportedCharsetException;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletMapping; import javax.servlet.http.HttpServletMapping;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -774,7 +775,10 @@ public class UrlPathHelper {
private static class Servlet4Delegate { private static class Servlet4Delegate {
public static boolean skipServletPathDetermination(HttpServletRequest request) { public static boolean skipServletPathDetermination(HttpServletRequest request) {
HttpServletMapping mapping = request.getHttpServletMapping(); HttpServletMapping mapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
if (mapping == null) {
mapping = request.getHttpServletMapping();
}
MappingMatch match = mapping.getMappingMatch(); MappingMatch match = mapping.getMappingMatch();
return (match != null && (!match.equals(MappingMatch.PATH) || mapping.getPattern().equals("/*"))); return (match != null && (!match.equals(MappingMatch.PATH) || mapping.getPattern().equals("/*")));
} }