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

Merge remote-tracking branch 'remotes/origin/issue-1642' into jetty-9.4.x

This commit is contained in:
Joakim Erdfelt 2017-07-19 10:33:20 -07:00
parent 650bc4bf89 95d43906bb
commit 2bcdf29cb3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
View File

@ -163,7 +163,7 @@ public class RuleContainer extends Rule
if (_rules==null)
return target;
for (Rule rule : _rules)
{
String applied=rule.matchAndApply(target,request, response);
@ -179,26 +179,29 @@ public class RuleContainer extends Rule
String query = request.getQueryString();
if (query != null)
request.setAttribute(_originalQueryStringAttribute,query);
}
}
// Ugly hack, we should just pass baseRequest into the API from RewriteHandler itself.
Request baseRequest = Request.getBaseRequest(request);
if (_rewriteRequestURI)
{
String encoded=URIUtil.encodePath(applied);
if (rule instanceof Rule.ApplyURI)
((Rule.ApplyURI)rule).applyURI((Request)request,((Request)request).getRequestURI(), encoded);
((Rule.ApplyURI)rule).applyURI(baseRequest, baseRequest.getRequestURI(), encoded);
else
((Request)request).setURIPathQuery(encoded);
baseRequest.setURIPathQuery(encoded);
}
if (_rewritePathInfo)
((Request)request).setPathInfo(applied);
baseRequest.setPathInfo(applied);
target=applied;
if (rule.isHandling())
{
LOG.debug("handling {}",rule);
Request.getBaseRequest(request).setHandled(true);
baseRequest.setHandled(true);
}
if (rule.isTerminating())