Revert "http: use Keep-Alive by default in global agents"

doc/api/http.md

@@ -1449,20 +1449,11 @@ type other than {net.Socket}.
 
 <!-- YAML
 added: v0.1.90
-changes:
-  - version:
-      - REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/43522
-    description: The method closes idle connections before returning.
-
 -->
 
 * `callback` {Function}
 
-Stops the server from accepting new connections and closes all connections
-connected to this server which are not sending a request or waiting for
-a response.
-See [`net.Server.close()`][].
+Stops the server from accepting new connections. See [`net.Server.close()`][].
 
 ### `server.closeAllConnections()`
 
@@ -3223,11 +3214,6 @@ server.listen(8000);
 
 <!-- YAML
 added: v0.5.9
-changes:
-  - version:
-      - REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/43522
-    description: The agent now uses HTTP Keep-Alive by default.
 -->
 
 * {http.Agent}

doc/api/https.md

@@ -309,11 +309,6 @@ https.get('https://encrypted.google.com/', (res) => {
 
 <!-- YAML
 added: v0.5.9
-changes:
-  - version:
-      - REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/43522
-    description: The agent now uses HTTP Keep-Alive by default.
 -->
 
 Global instance of [`https.Agent`][] for all HTTPS client requests.

lib/_http_agent.js

@@ -31,12 +31,10 @@ const {
   ArrayPrototypeSplice,
   FunctionPrototypeCall,
   NumberIsNaN,
-  NumberParseInt,
   ObjectCreate,
   ObjectKeys,
   ObjectSetPrototypeOf,
   ObjectValues,
-  RegExpPrototypeExec,
   StringPrototypeIndexOf,
   StringPrototypeSplit,
   StringPrototypeStartsWith,
@@ -494,24 +492,7 @@ Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {
   socket.setKeepAlive(true, this.keepAliveMsecs);
   socket.unref();
 
-  let agentTimeout = this.options.timeout || 0;
-
-  if (socket._httpMessage?.res) {
-    const keepAliveHint = socket._httpMessage.res.headers['keep-alive'];
-
-    if (keepAliveHint) {
-      const hint = RegExpPrototypeExec(/^timeout=(\d+)/, keepAliveHint)?.[1];
-
-      if (hint) {
-        const serverHintTimeout = NumberParseInt(hint) * 1000;
-
-        if (serverHintTimeout < agentTimeout) {
-          agentTimeout = serverHintTimeout;
-        }
-      }
-    }
-  }
-
+  const agentTimeout = this.options.timeout || 0;
   if (socket.timeout !== agentTimeout) {
     socket.setTimeout(agentTimeout);
   }
@@ -561,5 +542,5 @@ function asyncResetHandle(socket) {
 
 module.exports = {
   Agent,
-  globalAgent: new Agent({ keepAlive: true, scheduling: 'lifo', timeout: 5000 })
+  globalAgent: new Agent()
 };

lib/_http_server.js

@@ -478,7 +478,6 @@ ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);
 ObjectSetPrototypeOf(Server, net.Server);
 
 Server.prototype.close = function() {
-  this.closeIdleConnections();
   clearInterval(this[kConnectionsCheckingInterval]);
   ReflectApply(net.Server.prototype.close, this, arguments);
 };

lib/https.js

@@ -331,7 +331,7 @@ Agent.prototype._evictSession = function _evictSession(key) {
   delete this._sessionCache.map[key];
 };
 
-const globalAgent = new Agent({ keepAlive: true, scheduling: 'lifo', timeout: 5000 });
+const globalAgent = new Agent();
 
 /**
  * Makes a request to a secure web server.

test/async-hooks/test-graph.http.js

@@ -12,7 +12,6 @@ const hooks = initHooks();
 hooks.enable();
 
 const server = http.createServer(common.mustCall((req, res) => {
-  res.writeHead(200, { 'Connection': 'close' });
   res.end();
   server.close(common.mustCall());
 }));

test/parallel/test-http-client-agent.js

@@ -27,7 +27,6 @@ const Countdown = require('../common/countdown');
 
 let name;
 const max = 3;
-const agent = new http.Agent();
 
 const server = http.Server(common.mustCall((req, res) => {
   if (req.url === '/0') {
@@ -41,28 +40,27 @@ const server = http.Server(common.mustCall((req, res) => {
   }
 }, max));
 server.listen(0, common.mustCall(() => {
-  name = agent.getName({ port: server.address().port });
+  name = http.globalAgent.getName({ port: server.address().port });
   for (let i = 0; i < max; ++i)
     request(i);
 }));
 
 const countdown = new Countdown(max, () => {
-  assert(!(name in agent.sockets));
-  assert(!(name in agent.requests));
+  assert(!(name in http.globalAgent.sockets));
+  assert(!(name in http.globalAgent.requests));
   server.close();
 });
 
 function request(i) {
   const req = http.get({
     port: server.address().port,
-    path: `/${i}`,
-    agent
+    path: `/${i}`
   }, function(res) {
     const socket = req.socket;
     socket.on('close', common.mustCall(() => {
       countdown.dec();
       if (countdown.remaining > 0) {
-        assert.strictEqual(agent.sockets[name].includes(socket),
+        assert.strictEqual(http.globalAgent.sockets[name].includes(socket),
                            false);
       }
     }));

test/parallel/test-http-client-headers-array.js

@@ -10,7 +10,7 @@ function execute(options) {
     const expectHeaders = {
       'x-foo': 'boom',
       'cookie': 'a=1; b=2; c=3',
-      'connection': 'keep-alive'
+      'connection': 'close'
     };
 
     // no Host header when you set headers an array
@@ -28,7 +28,6 @@ function execute(options) {
 
     assert.deepStrictEqual(req.headers, expectHeaders);
 
-    res.writeHead(200, { 'Connection': 'close' });
     res.end();
   }).listen(0, function() {
     options = Object.assign(options, {

test/parallel/test-http-client-spurious-aborted.js

@@ -10,7 +10,7 @@ const N = 2;
 let abortRequest = true;
 
 const server = http.Server(common.mustCall((req, res) => {
-  const headers = { 'Content-Type': 'text/plain', 'Connection': 'close' };
+  const headers = { 'Content-Type': 'text/plain' };
   headers['Content-Length'] = 50;
   const socket = res.socket;
   res.writeHead(200, headers);

test/parallel/test-http-client-timeout-on-connect.js

@@ -13,10 +13,7 @@ const server = http.createServer((req, res) => {
 
 server.listen(0, common.localhostIPv4, common.mustCall(() => {
   const port = server.address().port;
-  const req = http.get(
-    `http://${common.localhostIPv4}:${port}`,
-    { agent: new http.Agent() }
-  );
+  const req = http.get(`http://${common.localhostIPv4}:${port}`);
 
   req.setTimeout(1);
   req.on('socket', common.mustCall((socket) => {

test/parallel/test-http-content-length.js

@@ -5,17 +5,17 @@ const http = require('http');
 const Countdown = require('../common/countdown');
 
 const expectedHeadersMultipleWrites = {
-  'connection': 'keep-alive',
+  'connection': 'close',
   'transfer-encoding': 'chunked',
 };
 
 const expectedHeadersEndWithData = {
-  'connection': 'keep-alive',
-  'content-length': String('hello world'.length),
+  'connection': 'close',
+  'content-length': String('hello world'.length)
 };
 
 const expectedHeadersEndNoData = {
-  'connection': 'keep-alive',
+  'connection': 'close',
   'content-length': '0',
 };
 
@@ -24,7 +24,6 @@ const countdown = new Countdown(3, () => server.close());
 
 const server = http.createServer(function(req, res) {
   res.removeHeader('Date');
-  res.setHeader('Keep-Alive', 'timeout=1');
 
   switch (req.url.substr(1)) {
     case 'multiple-writes':
@@ -60,8 +59,7 @@ server.listen(0, function() {
   req.write('hello ');
   req.end('world');
   req.on('response', function(res) {
-    assert.deepStrictEqual(res.headers, { ...expectedHeadersMultipleWrites, 'keep-alive': 'timeout=1' });
-    res.resume();
+    assert.deepStrictEqual(res.headers, expectedHeadersMultipleWrites);
   });
 
   req = http.request({
@@ -73,8 +71,7 @@ server.listen(0, function() {
   req.removeHeader('Host');
   req.end('hello world');
   req.on('response', function(res) {
-    assert.deepStrictEqual(res.headers, { ...expectedHeadersEndWithData, 'keep-alive': 'timeout=1' });
-    res.resume();
+    assert.deepStrictEqual(res.headers, expectedHeadersEndWithData);
   });
 
   req = http.request({
@@ -86,8 +83,7 @@ server.listen(0, function() {
   req.removeHeader('Host');
   req.end();
   req.on('response', function(res) {
-    assert.deepStrictEqual(res.headers, { ...expectedHeadersEndNoData, 'keep-alive': 'timeout=1' });
-    res.resume();
+    assert.deepStrictEqual(res.headers, expectedHeadersEndNoData);
   });
 
 });

test/parallel/test-http-default-encoding.js

@@ -32,9 +32,9 @@ const server = http.Server((req, res) => {
   req.on('data', (chunk) => {
     result += chunk;
   }).on('end', () => {
+    server.close();
     res.writeHead(200);
     res.end('hello world\n');
-    server.close();
   });
 
 });

test/parallel/test-http-max-headers-count.js

@@ -48,7 +48,7 @@ const server = http.createServer(function(req, res) {
     expected = maxAndExpected[requests][1];
     server.maxHeadersCount = max;
   }
-  res.writeHead(200, { ...headers, 'Connection': 'close' });
+  res.writeHead(200, headers);
   res.end();
 });
 server.maxHeadersCount = max;

test/parallel/test-http-outgoing-message-capture-rejection.js

@@ -16,11 +16,9 @@ events.captureRejections = true;
 
     res.socket.on('error', common.mustCall((err) => {
       assert.strictEqual(err, _err);
-      server.close();
     }));
 
     // Write until there is space in the buffer
-    res.writeHead(200, { 'Connection': 'close' });
     while (res.write('hello'));
   }));
 
@@ -39,6 +37,7 @@ events.captureRejections = true;
         code: 'ECONNRESET'
       }));
       res.resume();
+      server.close();
     }));
   }));
 }