Author: markt Date: Wed Aug 29 00:15:22 2012 New Revision: 1378395 URL: http://svn.apache.org/viewvc?rev=1378395&view=rev Log: Follow up to r1372390. Since decoded URI is used for matching, make sure it is set for the landing page. (kkolinko review)
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1378394 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1378395&r1=1378394&r2=1378395&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Wed Aug 29 00:15:22 2012 @@ -320,6 +320,7 @@ public class FormAuthenticator SavedRequest saved = new SavedRequest(); saved.setMethod("GET"); saved.setRequestURI(uri); + saved.setDecodedRequestURI(uri); request.getSessionInternal(true).setNote( Constants.FORM_REQUEST_NOTE, saved); response.sendRedirect(response.encodeRedirectURL(uri)); @@ -351,6 +352,7 @@ public class FormAuthenticator SavedRequest saved = new SavedRequest(); saved.setMethod("GET"); saved.setRequestURI(uri); + saved.setDecodedRequestURI(uri); session.setNote(Constants.FORM_REQUEST_NOTE, saved); response.sendRedirect(response.encodeRedirectURL(uri)); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org