Refactored SSL and iAP transports, support for running SSL on top

of TCP/iAP/Bluetooth.

1 files changed, 7 insertions, 9 deletions

diff --git a/js/src/Ice/browser/WSTransceiver.js b/js/src/Ice/browser/WSTransceiver.js
index 32a3661ecf6..7ee934bb664 100644
--- a/js/src/Ice/browser/WSTransceiver.js
+++ b/js/src/Ice/browser/WSTransceiver.js
@@ -272,15 +272,13 @@ var WSTransceiver = Ice.Class({
     getInfo: function()
     {
         Debug.assert(this._fd !== null);
-        var info = this._secure ? new IceSSL.WSSConnectionInfo() : new Ice.WSConnectionInfo();
-
-        //
-        // The WebSocket API doens't provide this info
-        //
-        info.localAddress = "";
-        info.localPort = -1;
-        info.remoteAddress = this._addr.host;
-        info.remotePort = this._addr.port;
+        var info = new Ice.WSConnectionInfo();
+        var tcpinfo = new Ice.TCPConnectionInfo();
+        tcpinfo.localAddress = "";
+        tcpinfo.localPort = -1;
+        tcpinfo.remoteAddress = this._addr.host;
+        tcpinfo.remotePort = this._addr.port;
+        info.underlying = this._secure ? new IceSSL.ConnectionInfo(tcpinfo, tcpinfo.timeout, tcpinfo.compress) : tcpinfo;
         info.rcvSize = -1;
         info.sndSize = this._maxSendPacketSize;
         info.headers = {};