Jetty 12 - Cherry-Pick of Servlet PathMapping improvements around RegexPathSpec #8693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…xtHandler (#7614) Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage Signed-off-by: Greg Wilkins <[email protected]> Signed-off-by: Joakim Erdfelt <[email protected]>
Fix 7891 regex pathInfo + Use the pathSpec methods to set servletPath and pathInfo when possible Signed-off-by: Greg Wilkins <[email protected]>
* Cherry-pick of Improvements to PathSpec. * From commit: 5b4d1dd * Fixing ConstraintSecurityHandler usage of PathMappings * Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope() * Cleanup of non ServletPathSpec behaviors in ServletPathMapping class * Skip optional group name/info lookup if regex fails. * Prevent NPE on static servletPathMappings * Update WebSocketMappings to use new PathMappings.getMatched(String) Signed-off-by: Joakim Erdfelt <[email protected]>
Signed-off-by: Joakim Erdfelt <[email protected]>
sbordet
reviewed
Oct 7, 2022
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/RegexServletTest.java
Outdated
Show resolved
Hide resolved
sbordet
approved these changes
Oct 7, 2022
|
This is not even close to being ready. The change in 12.0.x for MappedServlet is quite dramatic (from how it was in 10.0.x or 11.0.x) |
…servlet-pathmapping-regex
joakime
commented
Oct 12, 2022
| return null; | ||
| } | ||
|
|
||
| public ServletPathMapping getServletPathMapping(String pathInContext, MatchedPath matchedPath) |
There was a problem hiding this comment.
@gregw this is the new method that isn't being used consistently that I'm concerned about.
There is also a getServletPathMapping(String pathInContext) above this method that I couldn't get rid of (we should be able to get rid of it)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a result of a merge analysis done due to PR #8690
This PR is cherry-pick of the following PathMapping related commits from Jetty 10/11.