Author: markt Date: Mon Sep 4 10:48:50 2017 New Revision: 1807205 URL: http://svn.apache.org/viewvc?rev=1807205&view=rev Log: Given poor browser support for RFC 7617, default to current behaviour.
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/valve.xml Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1807205&r1=1807204&r2=1807205&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Mon Sep 4 10:48:50 2017 @@ -47,8 +47,8 @@ public class BasicAuthenticator extends private static final Log log = LogFactory.getLog(BasicAuthenticator.class); - private Charset charset = StandardCharsets.UTF_8; - private String charsetString = "UTF-8"; + private Charset charset = StandardCharsets.ISO_8859_1; + private String charsetString = null; public String getCharset() { Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1807205&r1=1807204&r2=1807205&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 4 10:48:50 2017 @@ -72,7 +72,8 @@ </add> <add> <bug>61280</bug>: Add RFC 7617 support to the - <code>BasicAuthenticator</code>. (markt) + <code>BasicAuthenticator</code>. Note that the default configuration + does not change the existin behaviour. (markt) </add> </changelog> </subsection> Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1807205&r1=1807204&r2=1807205&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Mon Sep 4 10:48:50 2017 @@ -1108,7 +1108,7 @@ from bytes to characters using UTF-8. Otherwise, no <code>charset</code> authentication parameter will be sent and the provided user name and optional password will be converted from bytes to characters using - ISO-8859-1. The default value is <code>UTF-8</code></p> + ISO-8859-1. The default value is <code>null</code></p> </attribute> <attribute name="className" required="true"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org