Remove invalid pos check from web-socket-js.
This commit is contained in:
parent
094b489b76
commit
7dfa20b8fd
|
@ -187,6 +187,7 @@ public class WebSocket extends EventDispatcher {
|
||||||
main.log("request header:\n" + req);
|
main.log("request header:\n" + req);
|
||||||
socket.writeUTFBytes(req);
|
socket.writeUTFBytes(req);
|
||||||
main.log("sent key3: " + key3);
|
main.log("sent key3: " + key3);
|
||||||
|
main.log("expected digest: " + expectedDigest);
|
||||||
writeBytes(key3);
|
writeBytes(key3);
|
||||||
socket.flush();
|
socket.flush();
|
||||||
}
|
}
|
||||||
|
@ -250,20 +251,18 @@ public class WebSocket extends EventDispatcher {
|
||||||
pos = -1;
|
pos = -1;
|
||||||
}
|
}
|
||||||
} else if (headerState == 4) {
|
} else if (headerState == 4) {
|
||||||
if (pos == 15) {
|
var replyDigest:String = readBytes(buffer, 16);
|
||||||
var replyDigest:String = readBytes(buffer, 16);
|
main.log("reply digest: " + replyDigest);
|
||||||
main.log("reply digest: " + replyDigest);
|
if (replyDigest != expectedDigest) {
|
||||||
if (replyDigest != expectedDigest) {
|
onError("digest doesn't match: " + replyDigest + " != " + expectedDigest);
|
||||||
onError("digest doesn't match: " + replyDigest + " != " + expectedDigest);
|
return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
headerState = 5;
|
|
||||||
makeBufferCompact();
|
|
||||||
pos = -1;
|
|
||||||
readyState = OPEN;
|
|
||||||
notifyStateChange();
|
|
||||||
dispatchEvent(new Event("open"));
|
|
||||||
}
|
}
|
||||||
|
headerState = 5;
|
||||||
|
makeBufferCompact();
|
||||||
|
pos = -1;
|
||||||
|
readyState = OPEN;
|
||||||
|
notifyStateChange();
|
||||||
|
dispatchEvent(new Event("open"));
|
||||||
} else {
|
} else {
|
||||||
if (buffer[pos] == 0xff) {
|
if (buffer[pos] == 0xff) {
|
||||||
//if (buffer.bytesAvailable > 1) {
|
//if (buffer.bytesAvailable > 1) {
|
||||||
|
|
Loading…
Reference in New Issue