jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix web-socket-js: encode sent data across FABridge.

This commit is contained in:
Joel Martin 2010-05-28 14:10:57 -05:00
parent af6b17ce06
commit d38406e6b5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/web-socket-js/flash-src/WebSocket.as
View File

@ -104,14 +104,14 @@ public class WebSocket extends EventDispatcher {
public function send(data:String):int { public function send(data:String):int {
if (readyState == OPEN) { if (readyState == OPEN) {
socket.writeByte(0x00); socket.writeByte(0x00);
socket.writeUTFBytes(data); socket.writeUTFBytes(decodeURIComponent(data));
socket.writeByte(0xff); socket.writeByte(0xff);
socket.flush(); socket.flush();
main.log("sent: " + data); main.log("sent: " + data);
return -1; return -1;
} else if (readyState == CLOSED) { } else if (readyState == CLOSED) {
var bytes:ByteArray = new ByteArray(); var bytes:ByteArray = new ByteArray();
bytes.writeUTFBytes(data); bytes.writeUTFBytes(decodeURIComponent(data));
bufferedAmount += bytes.length; // not sure whether it should include \x00 and \xff bufferedAmount += bytes.length; // not sure whether it should include \x00 and \xff
// We use return value to let caller know bufferedAmount because we cannot fire // We use return value to let caller know bufferedAmount because we cannot fire
// stateChange event here which causes weird error: // stateChange event here which causes weird error:

2
include/web-socket-js/web_socket.js
View File

@ -86,7 +86,7 @@
if (!this.__flash || this.readyState == WebSocket.CONNECTING) { if (!this.__flash || this.readyState == WebSocket.CONNECTING) {
throw "INVALID_STATE_ERR: Web Socket connection has not been established"; throw "INVALID_STATE_ERR: Web Socket connection has not been established";
} }
var result = this.__flash.send(data); var result = this.__flash.send(encodeURIComponent(data));
if (result < 0) { // success if (result < 0) { // success
return true; return true;
} else { } else {