openstack/deb-novnc
Code Issues Proposed changes

web-socket-js (issue #37): close() when connecting

Browse Source 
Filed this issue for this bug:
http://github.com/gimite/web-socket-js/issues/issue/37

Right now the close() call only calls __flash.close() if readyState is OPEN.
But it should really call close any time that readyState is not CLOSED or
CLOSING.

The case I ran into is when I want to do the following:
1. make a test connection
2. tell the server to setup for a connection
3. connect again

I call close on the test connection, but since it is ignored when CONNECTING,
it eventually times out with a error. But by that time I have already issued a
new connection, it causes the new connection to fail. close() should cancel
CONNECTING state too.
This commit is contained in:
Joel Martin 2010-09-11 13:52:49 -05:00
parent 00d645392a
commit f1b4494504
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,10 @@
WebSocket.prototype.close = function() {
if (!this.__flash) return;
this.readyState = this.__flash.getReadyState();
if (this.readyState != WebSocket.OPEN) return;
if ((this.readyState === WebSocket.CLOSED) ||
(this.readState === WebSocket.CLOSING)) {
return;
}
this.__flash.close();
// Sets/calls them manually here because Flash WebSocketConnection.close cannot fire events
// which causes weird error: