From 9414a990af7e4b146e61c181c3a9261645bc9dc3 Mon Sep 17 00:00:00 2001 From: henryorz Date: Wed, 7 Feb 2018 21:16:26 +0800 Subject: [PATCH 1/3] fix bugs of decode while polling --- .../corundumstudio/socketio/protocol/PacketDecoder.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java index 1e9bce4..e99d91e 100644 --- a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java +++ b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java @@ -63,7 +63,13 @@ public class PacketDecoder { // skip "d=" packet = packet.substring(2); } - packet = new String(packet.getBytes(CharsetUtil.ISO_8859_1), CharsetUtil.UTF_8); + + /** + * this line will convert some utf-8 characters to "?" + * + * @see https://github.com/mrniko/netty-socketio/issues/515 + */ + // packet = new String(packet.getBytes(CharsetUtil.ISO_8859_1), CharsetUtil.UTF_8); return Unpooled.wrappedBuffer(packet.getBytes(CharsetUtil.UTF_8)); } From 17bd4586e3494c37d7636ee7d8dd7e582634adc8 Mon Sep 17 00:00:00 2001 From: henryorz Date: Wed, 7 Feb 2018 22:10:02 +0800 Subject: [PATCH 2/3] remove comment --- .../corundumstudio/socketio/protocol/PacketDecoder.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java index e99d91e..8bed8e5 100644 --- a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java +++ b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java @@ -64,13 +64,6 @@ public class PacketDecoder { packet = packet.substring(2); } - /** - * this line will convert some utf-8 characters to "?" - * - * @see https://github.com/mrniko/netty-socketio/issues/515 - */ - // packet = new String(packet.getBytes(CharsetUtil.ISO_8859_1), CharsetUtil.UTF_8); - return Unpooled.wrappedBuffer(packet.getBytes(CharsetUtil.UTF_8)); } From 30bb876249dd6f7659b4ff4386ae8a4889e807bb Mon Sep 17 00:00:00 2001 From: henryorz Date: Wed, 21 Feb 2018 19:49:34 +0800 Subject: [PATCH 3/3] remove ISO_8859_1 encode in PacketDecoder --- .../com/corundumstudio/socketio/protocol/PacketDecoder.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java index 8bed8e5..54dfd56 100644 --- a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java +++ b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java @@ -135,9 +135,6 @@ public class PacketDecoder { int len = utf8scanner.getActualLength(buffer, lenHeader); ByteBuf frame = buffer.slice(buffer.readerIndex() + 1, len); - if (lenHeader != len) { - frame = Unpooled.wrappedBuffer(frame.toString(CharsetUtil.UTF_8).getBytes(CharsetUtil.ISO_8859_1)); - } // skip this frame buffer.readerIndex(buffer.readerIndex() + 1 + len); return decode(client, frame);