Author: markt
Date: Tue Mar 5 11:28:45 2013
New Revision: 1452745
URL: http://svn.apache.org/r1452745
Log:
Update UTF-8 decoder used by WebSocket connections.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java
- copied unchanged from r1452294,
tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java
- copied, changed from r1452718,
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java
Removed:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Utf8Decoder.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestUtf8.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1452745&r1=1452744&r2=1452745&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Tue Mar 5 11:28:45 2013
@@ -27,6 +27,7 @@ import java.nio.charset.UnmappableCharac
import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.coyote.http11.upgrade.UpgradeOutbound;
import org.apache.coyote.http11.upgrade.UpgradeProcessor;
+import org.apache.tomcat.util.buf.Utf8Decoder;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
/**
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1452745&r1=1452744&r2=1452745&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java Tue
Mar 5 11:28:45 2013
@@ -24,6 +24,7 @@ import java.nio.charset.CoderResult;
import org.apache.catalina.util.Conversions;
import org.apache.coyote.http11.upgrade.UpgradeProcessor;
+import org.apache.tomcat.util.buf.Utf8Decoder;
import org.apache.tomcat.util.res.StringManager;
/**
Copied: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java
(from r1452718, tomcat/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java&p1=tomcat/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java&r1=1452718&r2=1452745&rev=1452745&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java Tue Mar
5 11:28:45 2013
@@ -54,7 +54,8 @@ public class TestUtf8 {
// Indicates that three replacement characters are missing
private static final int REPLACE_MISSING4 = 64;
- public static final List<Utf8TestCase> TEST_CASES = new ArrayList<>();
+ public static final List<Utf8TestCase> TEST_CASES =
+ new ArrayList<Utf8TestCase>();
static {
TEST_CASES.add(new Utf8TestCase(
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=1452745&r1=1452744&r2=1452745&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 5 11:28:45 2013
@@ -86,6 +86,11 @@
<bug>54584</bug>: Take account of the delegate attribute when building
the web application class path to pass to the JSP compiler. (markt)
</fix>
+ <fix>
+ Copy the updated and re-packaged UTF-8 decoder from Tomcat 8.0.x and
use
+ this improved decoder for WebSocket connections. Remove the WebSocket
+ specific UTF-8 decoder. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
