Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Support 'upgrade' event in HTTP client.

- Add a unit test for client HTTP upgrade.
- Move around unit tests for server HTTP upgrade.
  • Loading branch information...
commit 187f191558ef45562865e071fdcd11e1dbec79df 1 parent cbf2a22
@pgriess pgriess authored ry committed
View
13 lib/http.js
@@ -851,11 +851,18 @@ function Client ( ) {
self.destroy(ret);
} else if (parser.incoming && parser.incoming.upgrade) {
var bytesParsed = ret;
- var upgradeHead = d.slice(start + bytesParsed, end - start);
- parser.incoming.upgradeHead = upgradeHead;
- var req = self._outgoing[0];
self.ondata = null;
self.onend = null
+
+ var req = self._outgoing[0];
+
+ var upgradeHead = d.slice(start + bytesParsed + 1, end);
+
+ if (self.listeners('upgrade').length) {
+ self.emit('upgrade', req, self, upgradeHead);
+ } else {
+ self.destroy();
+ }
}
};
View
79 test/simple/test-http-upgrade-client.js
@@ -0,0 +1,79 @@
+// Verify that the 'upgrade' header causes an 'upgrade' event to be emitted to
+// the HTTP client. This test uses a raw TCP server to better control server
+// behavior.
+
+require('../common');
+
+var http = require('http');
+var net = require('net');
+var sys = require('sys');
+
+var PORT = 5000 + Math.floor(Math.random() * 1000);
+
+// 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
+var srv = net.createServer(function(c) {
+ var data = '';
+ c.addListener('data', function(d) {
+ 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('connection: upgrade\r\n');
+ c.write('upgrade: ' + headers.upgrade + '\r\n');
+ c.write('\r\n');
+ c.write('nurtzo');
+
+ c.end();
+ });
+});
+srv.listen(PORT, '127.0.0.1');
+
+var gotUpgrade = false;
+var hc = http.createClient(PORT, '127.0.0.1');
+hc.addListener('upgrade', function(req, socket, upgradeHead) {
+ // XXX: This test isn't fantastic, as it assumes that the entire response
+ // from the server will arrive in a single data callback
+ assert.equal(upgradeHead, 'nurtzo');
+
+ socket.end();
+ srv.close();
+
+ gotUpgrade = true;
+});
+hc.request('/', {
+ 'Connection' : 'Upgrade',
+ 'Upgrade' : 'WebSocket'
+}).end();
+
+process.addListener('exit', function() {
+ assert.ok(gotUpgrade);
+});
View
0  test/simple/test-http-upgrade.js → test/simple/test-http-upgrade-server.js
File renamed without changes
View
0  test/simple/test-http-upgrade2.js → test/simple/test-http-upgrade-server2.js
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.