From aeddb5a66c6f8ec0352269eca0527ff5e629cc9b Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Thu, 15 Aug 2013 14:02:21 +0800 Subject: [PATCH 1/2] fix line break in js --- src/com/strumsoft/websocket/phonegap/WebSocket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/strumsoft/websocket/phonegap/WebSocket.java b/src/com/strumsoft/websocket/phonegap/WebSocket.java index 736e6cd..1970b31 100755 --- a/src/com/strumsoft/websocket/phonegap/WebSocket.java +++ b/src/com/strumsoft/websocket/phonegap/WebSocket.java @@ -399,7 +399,7 @@ public int getReadyState() { private String buildJavaScriptData(String event, String msg) { String _d = "javascript:WebSocket." + event + "(" + "{" + "\"_target\":\"" + id + "\"," + "\"data\":'" + msg.replaceAll("'", "\\\\'") + "'" + "}" + ")"; - return _d; + return _d.replaceAll("\n", "\\\\n"); } // ////////////////////////////////////////////////////////////////////////////////////// From 45126d559346c08f8f9dca9fe97feb53ff0b5e20 Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Thu, 15 Aug 2013 14:03:40 +0800 Subject: [PATCH 2/2] missing raw query string --- src/com/strumsoft/websocket/phonegap/WebSocket.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/strumsoft/websocket/phonegap/WebSocket.java b/src/com/strumsoft/websocket/phonegap/WebSocket.java index 1970b31..b9a070f 100755 --- a/src/com/strumsoft/websocket/phonegap/WebSocket.java +++ b/src/com/strumsoft/websocket/phonegap/WebSocket.java @@ -474,6 +474,9 @@ private void _writeHandshake() throws IOException { if (path.indexOf("/") != 0) { path = "/" + path; } + if (uri.getRawQuery() != null) { + path += "?" + uri.getRawQuery(); + } String host = uri.getHost() + (port != DEFAULT_PORT ? ":" + port : ""); String origin = "*"; // TODO: Make 'origin' configurable