Author: markt Date: Sun Nov 30 14:43:01 2008 New Revision: 721916 URL: http://svn.apache.org/viewvc?rev=721916&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105 Correctly set URI encoding when replaying a request after FORM auth
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 14:43:01 2008 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709816,711126 +/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,711126 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721916&r1=721915&r2=721916&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 14:43:01 2008 @@ -136,12 +136,6 @@ really old to me, so where would this come from ?) -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105 - Correctly set URI encoding when replaying a request after FORM auth - http://svn.apache.org/viewvc?rev=709294&view=rev - +1: markt, fhanik, remm - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46125 Change the exception to cause a 400 status code if the request headers are too big Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=721916&r1=721915&r2=721916&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Sun Nov 30 14:43:01 2008 @@ -426,7 +426,9 @@ } request.getCoyoteRequest().getParameters().recycle(); - + request.getCoyoteRequest().getParameters().setQueryStringEncoding( + request.getConnector().getURIEncoding()); + if ("POST".equalsIgnoreCase(saved.getMethod())) { ByteChunk body = saved.getBody(); Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721916&r1=721915&r2=721916&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 14:43:01 2008 @@ -180,6 +180,10 @@ The invoker servlet has been deprecated and will be removed in Tomcat 7 onwards. (markt) </fix> + <fix> + <bug>46105</bug>: Correctly set URI encoding when replaying a request + after FORM authentication. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]