Skip to content

Fix argument order for ws stream pass #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yawnt merged 1 commit into from
Jan 28, 2014
Merged

Fix argument order for ws stream pass #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/http-proxy/passes/ws-incoming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var passes = exports;
*
* @api private
*/
function stream(req, socket, options, server, head, clb) {
function stream(req, socket, options, head, server, clb) {
common.setupSocket(socket);

if (head && head.length) socket.unshift(head);
Expand Down
24 changes: 22 additions & 2 deletions test/lib-http-proxy-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,29 @@ describe('lib/http-proxy.js', function() {
});
});
});
});

describe('#createProxyServer using the ws-incoming passes', function () {
it('should emit error on proxy error', function (done) {
var ports = { source: gen.port, proxy: gen.port };
var proxy = httpProxy.createProxyServer({
// note: we don't ever listen on this port
target: 'ws://127.0.0.1:' + ports.source,
ws: true
}),
proxyServer = proxy.listen(ports.proxy),
client = new ws('ws://127.0.0.1:' + ports.proxy);

client.on('open', function () {
client.send('hello there');
});

proxy.on('error', function (err) {
expect(err).to.be.an(Error);
expect(err.code).to.be('ECONNREFUSED');
proxyServer._server.close();
done();
});
});

it('should proxy a socket.io stream', function (done) {
var ports = { source: gen.port, proxy: gen.port };
var proxy = httpProxy.createProxyServer({
Expand Down