Skip to content

Commit fcdbf46

Browse files
committed
Merge pull request #709 from minrk/close-on-error
close socket if upstream request fails
2 parents 43c6f0c + c627663 commit fcdbf46

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

lib/http-proxy/passes/ws-incoming.js

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ var passes = exports;
124124
} else {
125125
server.emit('error', err, req, socket);
126126
}
127+
socket.end();
127128
}
128129
}
129130

test/lib-http-proxy-test.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,24 @@ describe('lib/http-proxy.js', function() {
280280
client.on('open', function () {
281281
client.send('hello there');
282282
});
283+
284+
var count = 0;
285+
function maybe_done () {
286+
count += 1;
287+
if (count === 2) done();
288+
}
283289

284290
client.on('error', function (err) {
285291
expect(err).to.be.an(Error);
286292
expect(err.code).to.be('ECONNRESET');
293+
maybe_done();
287294
});
288295

289296
proxy.on('error', function (err) {
290297
expect(err).to.be.an(Error);
291298
expect(err.code).to.be('ECONNREFUSED');
292299
proxyServer.close();
293-
done();
300+
maybe_done();
294301
});
295302
});
296303

0 commit comments

Comments
 (0)