Update for milestone

Author: mondain

pom.xml

@@ -3,7 +3,11 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
+<<<<<<< HEAD
         <version>1.0.8-M4</version>
+=======
+        <version>1.0.8-M2</version>
+>>>>>>> 445926d934baf58e0b39d2cdb44dbf126aa61401
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>websocket</artifactId>

src/main/java/org/red5/net/websocket/codec/WebSocketDecoder.java

@@ -441,7 +441,7 @@ public static void decodeIncommingData(IoBuffer in, IoSession session) {
             decoderState.frameLen = (frameInfo2 & (byte) 0x7F);
             log.trace("Payload length: {}", decoderState.frameLen);
             if (decoderState.frameLen == 126) {
-                decoderState.frameLen = in.getShort();
+                decoderState.frameLen = in.getUnsignedShort();
                 log.trace("Payload length updated: {}", decoderState.frameLen);
             } else if (decoderState.frameLen == 127) {
                 long extendedLen = in.getLong();
@@ -582,4 +582,4 @@ public static Map<String, Object> parseQuerystring(String query) {
         return map;
     }
 
-}
+}