Skip to content

Commit

Permalink
http: fix http agent keep alive
Browse files Browse the repository at this point in the history
PR-URL: #43380
Reviewed-By: Paolo Insogna <paolo@cowtech.it>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ricky Zhou <0x19951125@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
  • Loading branch information
theanarkh authored and targos committed Jul 12, 2022
1 parent df50131 commit d71ba32
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/_http_agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,11 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
installListeners(this, s, options);
cb(null, s);
});

// When keepAlive is true, pass the related options to createConnection
if (this.keepAlive) {
options.keepAlive = this.keepAlive;
options.keepAliveInitialDelay = this.keepAliveMsecs;
}
const newSocket = this.createConnection(options, oncreate);
if (newSocket)
oncreate(null, newSocket);
Expand Down
36 changes: 36 additions & 0 deletions test/parallel/test-http-agent-keepalive-delay.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const http = require('http');
const { Agent } = require('_http_agent');

const agent = new Agent({
keepAlive: true,
keepAliveMsecs: 1000,
});

const server = http.createServer(common.mustCall((req, res) => {
res.end('ok');
}));

server.listen(0, common.mustCall(() => {
const createConnection = agent.createConnection;
agent.createConnection = (options, ...args) => {
assert.strictEqual(options.keepAlive, true);
assert.strictEqual(options.keepAliveInitialDelay, agent.keepAliveMsecs);
return createConnection.call(agent, options, ...args);
};
http.get({
host: 'localhost',
port: server.address().port,
agent: agent,
path: '/'
}, common.mustCall((res) => {
// for emit end event
res.on('data', () => {});
res.on('end', () => {
server.close();
});
}));
}));

0 comments on commit d71ba32

Please sign in to comment.