Author: markt
Date: Tue Aug 14 22:37:56 2012
New Revision: 1373154
URL: http://svn.apache.org/viewvc?rev=1373154&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53624
Remove some include specific code from dispatch, copied when the doDispatch()
method was created.
Note that this bug report pre-dates that copy. At the time of the bug report,
dispatch was implemented by calling include()
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1373142
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1373154&r1=1373153&r2=1373154&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Tue Aug 14 22:37:56 2012
@@ -631,29 +631,15 @@ final class ApplicationDispatcher implem
throws ServletException, IOException {
// Set up to handle the specified request and response
- State state = new State(request, response, true);
+ State state = new State(request, response, false);
// Create a wrapped response to use for this request
wrapResponse(state);
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest(state);
- String contextPath = context.getPath();
- if (requestURI != null)
- wrequest.setAttribute(RequestDispatcher.INCLUDE_REQUEST_URI,
- requestURI);
- if (contextPath != null)
- wrequest.setAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH,
- contextPath);
- if (servletPath != null)
- wrequest.setAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH,
- servletPath);
- if (pathInfo != null)
- wrequest.setAttribute(RequestDispatcher.INCLUDE_PATH_INFO,
- pathInfo);
+
if (queryString != null) {
- wrequest.setAttribute(RequestDispatcher.INCLUDE_QUERY_STRING,
- queryString);
wrequest.setQueryParams(queryString);
}
@@ -662,7 +648,7 @@ final class ApplicationDispatcher implem
wrequest.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
getCombinedPath());
- wrequest.setContextPath(contextPath);
+ wrequest.setContextPath(context.getPath());
wrequest.setRequestURI(requestURI);
wrequest.setServletPath(servletPath);
wrequest.setPathInfo(pathInfo);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1373154&r1=1373153&r2=1373154&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 14 22:37:56 2012
@@ -123,6 +123,11 @@
request at each stage. (markt)
</fix>
<fix>
+ <bug>53624</bug>: Ensure that
+ <code>HttpServletResponse.sendRedirect()</code> works when called after
+ a dispatch from an <code>AsyncContext</code>. (markt)
+ </fix>
+ <fix>
<bug>53641</bug>: Correct name of HTTP header used in WebSocket
handshake for listing the preferred protocols. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
