1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass correct message in HTTP client upgrade

Browse Source 
Simplify and correct test.

Fix by Fedor Indutny.
This commit is contained in:
Ryan Dahl 2010-09-19 11:53:32 -07:00
parent 4962702e4a
commit db73c71280
2 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http.js
View File

@ -891,7 +891,7 @@ function Client ( ) {
self.ondata = null; self.ondata = null;
self.onend = null self.onend = null
var req = self._outgoing[0]; var req = parser.incoming;
var upgradeHead = d.slice(start + bytesParsed + 1, end); var upgradeHead = d.slice(start + bytesParsed + 1, end);

49
test/simple/test-http-upgrade-client.js
View File

@ -8,48 +8,21 @@ assert = common.assert
var http = require('http'); var http = require('http');
var net = require('net'); var net = require('net');
// Parse a string of data, returning an object if headers are complete, and
// undefined otherwise
var parseHeaders = function(data) {
var m = data.search(/\r\n\r\n/);
if (!m) {
return;
}
var o = {};
data.substring(0, m.index).split('\r\n').forEach(function(h) {
var foo = h.split(':');
if (foo.length < 2) {
return;
}
o[foo[0].trim().toLowerCase()] = foo[1].trim().toLowerCase();
});
return o;
};
// Create a TCP server // Create a TCP server
var srv = net.createServer(function(c) { var srv = net.createServer(function(c) {
var data = ''; var data = '';
c.addListener('data', function(d) { c.addListener('data', function(d) {
data += d.toString('utf8'); data += d.toString('utf8');
// We found the end of the headers; make sure that we have an 'upgrade'
// header and send back a response
var headers = parseHeaders(data);
if (!headers) {
return;
}
assert.ok('upgrade' in headers);
c.write('HTTP/1.1 101\r\n'); c.write('HTTP/1.1 101\r\n');
c.write('hello: world\r\n');
c.write('connection: upgrade\r\n'); c.write('connection: upgrade\r\n');
c.write('upgrade: ' + headers.upgrade + '\r\n'); c.write('upgrade: websocket\r\n');
c.write('\r\n'); c.write('\r\n');
c.write('nurtzo'); c.write('nurtzo');
});
c.addListener('end', function() {
c.end(); c.end();
}); });
}); });
@ -57,20 +30,24 @@ srv.listen(common.PORT, '127.0.0.1');
var gotUpgrade = false; var gotUpgrade = false;
var hc = http.createClient(common.PORT, '127.0.0.1'); var hc = http.createClient(common.PORT, '127.0.0.1');
hc.addListener('upgrade', function(req, socket, upgradeHead) { hc.addListener('upgrade', function(res, socket, upgradeHead) {
// XXX: This test isn't fantastic, as it assumes that the entire response // XXX: This test isn't fantastic, as it assumes that the entire response
// from the server will arrive in a single data callback // from the server will arrive in a single data callback
assert.equal(upgradeHead, 'nurtzo'); assert.equal(upgradeHead, 'nurtzo');
console.log(res.headers);
var expectedHeaders = { "hello": "world"
, "connection": "upgrade"
, "upgrade": "websocket"
};
assert.deepEqual(expectedHeaders, res.headers);
socket.end(); socket.end();
srv.close(); srv.close();
gotUpgrade = true; gotUpgrade = true;
}); });
hc.request('/', { hc.request('GET', '/').end();
'Connection' : 'Upgrade',
'Upgrade' : 'WebSocket'
}).end();
process.addListener('exit', function() { process.addListener('exit', function() {
assert.ok(gotUpgrade); assert.ok(gotUpgrade);