diff options
| author | Fraser Adams <fraser.adams@blueyonder.co.uk> | 2014-01-31 10:36:07 +0000 |
|---|---|---|
| committer | Fraser Adams <fraser.adams@blueyonder.co.uk> | 2014-01-31 10:36:07 +0000 |
| commit | 9ed679c54f623f8b3ee41bcda1b540adc94a2693 (patch) | |
| tree | 4d3b3b32507af8fecab031311058e9713a7bda5c | |
| parent | 43ee264bab811099b3a6581f2ae87d501675a4e7 (diff) | |
Removed capitals from a comment as requested, reinstated UDP test that was accidentally dropped and updated settings.js comment.
| -rw-r--r-- | src/library_sockfs.js | 2 | ||||
| -rw-r--r-- | src/settings.js | 3 | ||||
| -rw-r--r-- | tests/test_sockets.py | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/library_sockfs.js b/src/library_sockfs.js index 712c6d85..3f758e5c 100644 --- a/src/library_sockfs.js +++ b/src/library_sockfs.js @@ -131,7 +131,7 @@ mergeInto(LibraryManager.library, { port = parseInt(result[2], 10); } } else { - // Create the actual websocket object and connect. + // create the actual websocket object and connect try { // runtimeConfig gets set to true if WebSocket runtime configuration is available. var runtimeConfig = (Module['websocket'] && ('object' === typeof Module['websocket'])); diff --git a/src/settings.js b/src/settings.js index 93f141ba..04571e8a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -221,7 +221,8 @@ var SOCKET_WEBRTC = 0; // Select socket backend, either webrtc or websockets. // Module['websocket'] = {subprotocol: 'base64, binary, text'}; // Module['websocket'] = {url: 'wss://', subprotocol: 'base64'}; // Run time configuration may be useful as it lets an application select multiple different services. -var WEBSOCKET_URL = 'ws://'; // A string containing either a WebSocket URL prefix (ws:// or wss://) or a complete URL. +var WEBSOCKET_URL = 'ws://'; // A string containing either a WebSocket URL prefix (ws:// or wss://) or a complete + // RFC 6455 URL - "ws[s]:" "//" host [ ":" port ] path [ "?" query ]. // In the (default) case of only a prefix being specified the URL will be constructed from // prefix + addr + ':' + port // where addr and port are derived from the socket connect/bind/accept calls. diff --git a/tests/test_sockets.py b/tests/test_sockets.py index d7cbb861..030a26a3 100644 --- a/tests/test_sockets.py +++ b/tests/test_sockets.py @@ -416,6 +416,7 @@ class sockets(BrowserCore): harnesses = [ (WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include], 49160)), (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=0'], 49161)), + (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=1'], 49161)) ] # Basic test of node client against both a Websockified and compiled echo server. |