This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6311bcff2849b40e84976d48bd158ec7687688c7 Author: Knut Sander <[email protected]> AuthorDate: Thu Feb 24 18:40:16 2022 +0100 Fix Response#sendRedirect() if no request context exists. If no ROOT context is defined, the context may be null in special cases, e.g. RewriteValve may use Response#sendRedirect() without any application context associated. In this case, the Tomcat behaviors for the context attributes useRelativeRedirects and sendRedirectBody are assumed, but without considering org.apache.catalina.STRICT_SERVLET_COMPLIANCE. --- java/org/apache/catalina/connector/Response.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 677ae41..e83b137 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -1287,17 +1287,22 @@ public class Response implements HttpServletResponse { // Generate a temporary redirect to the specified location try { + Context context = getContext(); + // If no ROOT context is defined, the context can be null. + // In this case, the default Tomcat values are assumed, but without + // respect to org.apache.catalina.STRICT_SERVLET_COMPLIANCE. + boolean reqHasContext = context == null; String locationUri; // Relative redirects require HTTP/1.1 if (getRequest().getCoyoteRequest().getSupportsRelativeRedirects() && - getContext().getUseRelativeRedirects()) { + (!reqHasContext || context.getUseRelativeRedirects())) { locationUri = location; } else { locationUri = toAbsolute(location); } setStatus(status); setHeader("Location", locationUri); - if (getContext().getSendRedirectBody()) { + if (reqHasContext && context.getSendRedirectBody()) { PrintWriter writer = getWriter(); writer.print(sm.getString("coyoteResponse.sendRedirect.note", Escape.htmlElementContent(locationUri))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
