Commit 81bcf70f authored by Joel Martin's avatar Joel Martin

Higher connectTimeout default with web-socket-js.

Current timeout is 2 seconds for connect timeout. Use 5 seconds if
web-socket-js (Flash WebSockets emulator) is being used. On Windows XP
with Flash 10.2.152.26, connecting seems to take quite a bit longer
than it probably should. This should make it work more consistently.
parent bbd21ca7
...@@ -129,7 +129,11 @@ cdef('true_color', 'bool', true, 'Request true color pixel data'); ...@@ -129,7 +129,11 @@ cdef('true_color', 'bool', true, 'Request true color pixel data');
cdef('local_cursor', 'bool', false, 'Request locally rendered cursor'); cdef('local_cursor', 'bool', false, 'Request locally rendered cursor');
cdef('shared', 'bool', true, 'Request shared mode'); cdef('shared', 'bool', true, 'Request shared mode');
cdef('connectTimeout', 'int', 2, 'Time (s) to wait for connection'); if (Websock_native) {
cdef('connectTimeout', 'int', 2, 'Time (s) to wait for connection');
} else {
cdef('connectTimeout', 'int', 5, 'Time (s) to wait for connection');
}
cdef('disconnectTimeout', 'int', 3, 'Time (s) to wait for disconnection'); cdef('disconnectTimeout', 'int', 3, 'Time (s) to wait for disconnection');
cdef('check_rate', 'int', 217, 'Timing (ms) of send/receive check'); cdef('check_rate', 'int', 217, 'Timing (ms) of send/receive check');
cdef('fbu_req_rate', 'int', 1413, 'Timing (ms) of frameBufferUpdate requests'); cdef('fbu_req_rate', 'int', 1413, 'Timing (ms) of frameBufferUpdate requests');
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
/*jslint evil: true */ /*jslint evil: true */
/*global window, document, INCLUDE_URI */ /*global window, document, INCLUDE_URI */
// Globals defined here
var VNC_native_ws, WEB_SOCKET_SWF_LOCATION;
/* /*
* Load supporting scripts * Load supporting scripts
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment