Commit bdd6352d authored by indexzero's avatar indexzero Committed by Cédric de Saint Martin

[refactor minor] Update vendor/websocket.js to be compatible with node@0.6.x

parent f4653eea
......@@ -496,7 +496,7 @@ var WebSocket = function(url, proto, opts) {
if (u.protocol === 'ws:' || u.protocol === 'wss:') {
protocol = u.protocol === 'ws:' ? http : https;
port = u.protocol === 'ws:' ? 80 : 443;
agent = u.protocol === 'ws:' ? protocol.getAgent(u.hostname, u.port || port) : protocol.getAgent({
agent = u.protocol === new protocol.Agent({
host: u.hostname,
port: u.port || port
});
......@@ -514,8 +514,20 @@ var WebSocket = function(url, proto, opts) {
throw new Error('Invalid URL scheme \'' + urlScheme + '\' specified.');
}
if (!agent._events || agent._events['upgrade'].length === 0) {
agent.on('upgrade', (function() {
var httpReq = protocol.request({
host: u.hostname,
method: 'GET',
agent: agent,
port: u.port,
path: httpPath,
headers: httpHeaders
});
httpReq.on('error', function (e) {
errorListener(e);
});
httpReq.on('upgrade', (function() {
var data = undefined;
return function(res, s, head) {
......@@ -607,20 +619,6 @@ var WebSocket = function(url, proto, opts) {
stream.emit('data', head);
};
})());
}
agent.on('error', function (e) {
errorListener(e);
});
var httpReq = protocol.request({
host: u.hostname,
method: 'GET',
agent: agent,
port: u.port,
path: httpPath,
headers: httpHeaders
});
httpReq.write(challenge, 'binary');
httpReq.end();
......
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