Author: markt
Date: Sun Nov 11 23:45:46 2012
New Revision: 1408155
URL: http://svn.apache.org/viewvc?rev=1408155&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54124
Correct ASYNC_REQUEST_URI. Addition of query string appears to be left over
debug code
Add missing ASYNC_PATH_INFO which appears to be an oversight.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1408154
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1408155&r1=1408154&r2=1408155&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Sun Nov 11 23:45:46 2012
@@ -164,9 +164,10 @@ public class AsyncContextImpl implements
}
check();
if (request.getAttribute(ASYNC_REQUEST_URI)==null) {
- request.setAttribute(ASYNC_REQUEST_URI,
request.getRequestURI()+"?"+request.getQueryString());
+ request.setAttribute(ASYNC_REQUEST_URI, request.getRequestURI());
request.setAttribute(ASYNC_CONTEXT_PATH, request.getContextPath());
request.setAttribute(ASYNC_SERVLET_PATH, request.getServletPath());
+ request.setAttribute(ASYNC_PATH_INFO, request.getPathInfo());
request.setAttribute(ASYNC_QUERY_STRING, request.getQueryString());
}
final RequestDispatcher requestDispatcher =
context.getRequestDispatcher(path);
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=1408155&r1=1408154&r2=1408155&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Nov 11 23:45:46 2012
@@ -128,6 +128,11 @@
<code>AsyncListener</code>s defined, a 500 error will be triggered.
(markt)
</fix>
+ <fix>
+ <bug>54124</bug>: Correct provided value of request attribute
+ <code>javax.servlet.async.request_uri</code> and add missing request
+ attribute <code>javax.servlet.async.path_info</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
