Author: markt
Date: Thu Aug 24 23:18:13 2017
New Revision: 1806107
URL: http://svn.apache.org/viewvc?rev=1806107&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61452
Fix a copy paste error
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestURLEncoder.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1806107&r1=1806106&r2=1806107&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Thu Aug 24 23:18:13 2017
@@ -393,7 +393,7 @@ public class WebdavServlet extends Defau
*/
@Override
protected String rewriteUrl(String path) {
- return URL_ENCODER_XML.encode(path, "UTF_8");
+ return URL_ENCODER_XML.encode(path, "UTF-8");
}
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestURLEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestURLEncoder.java?rev=1806107&r1=1806106&r2=1806107&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestURLEncoder.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestURLEncoder.java Thu
Aug 24 23:18:13 2017
@@ -33,11 +33,11 @@ public class TestURLEncoder {
// Ensure encode as space is not shared
original.setEncodeSpaceAsPlus(true);
- Assert.assertNotEquals(original.encode(SPACE, "UTF-8"),
clone.encode(SPACE, "UTF_8"));
+ Assert.assertNotEquals(original.encode(SPACE, "UTF-8"),
clone.encode(SPACE, "UTF-8"));
// Ensure safe characters is not shared
original.addSafeCharacter('$');
- Assert.assertNotEquals(original.encode(DOLLAR, "UTF_8"),
clone.encode(DOLLAR, "UTF_8"));
+ Assert.assertNotEquals(original.encode(DOLLAR, "UTF-8"),
clone.encode(DOLLAR, "UTF-8"));
}
@@ -45,8 +45,8 @@ public class TestURLEncoder {
public void testRemoveSafeCharacter() {
URLEncoder xml = (URLEncoder) URLEncoder.DEFAULT.clone();
// This should not encode '&'
- Assert.assertEquals(AMPERSAND, xml.encode(AMPERSAND, "UTF_8"));
+ Assert.assertEquals(AMPERSAND, xml.encode(AMPERSAND, "UTF-8"));
xml.removeSafeCharacter('&');
- Assert.assertEquals(AMPERSAND_ENCODED, xml.encode(AMPERSAND, "UTF_8"));
+ Assert.assertEquals(AMPERSAND_ENCODED, xml.encode(AMPERSAND, "UTF-8"));
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1806107&r1=1806106&r2=1806107&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Aug 24 23:18:13 2017
@@ -62,6 +62,10 @@
accessing the WebSocket examples when running under a
<code>SecurityManager</code>. (markt)
</fix>
+ <fix>
+ <bug>61452</bug>: Fix a copy paste error that caused an
+ <code>UnsupportedEncodingException</code> when using WebDAV. (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
