From e2b81e19768b3239077e248d3072255742e2a477 Mon Sep 17 00:00:00 2001
From: Shogun <paolo@cowtech.it>
Date: Tue, 1 Mar 2022 15:56:07 +0100
Subject: [PATCH 1/2] http: make TCP noDelay enabled by default

---
 doc/api/http.md                    |  6 ++++-
 doc/api/net.md                     |  4 ++++
 lib/_http_agent.js                 |  3 +++
 lib/_http_server.js                |  3 +++
 test/parallel/test-http-nodelay.js | 37 ++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-http-nodelay.js

diff --git a/doc/api/http.md b/doc/api/http.md
index 09a51b42dbaf45..2cf04681a416e4 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -2838,6 +2838,10 @@ Found'`.
 <!-- YAML
 added: v0.1.13
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/41310
+    description: The `noDelay`, `keepAlive` and `keepAliveInitialDelay`
+                 options are supported now.
   - version:
      - v13.8.0
      - v12.15.0
@@ -2871,7 +2875,7 @@ changes:
     **Default:** 16384 (16 KB).
   * `noDelay` {boolean} If set to `true`, it disables the use of Nagle's
     algorithm immediately after a new incoming connection is received.
-    **Default:** `false`.
+    **Default:** `true`.
   * `keepAlive` {boolean} If set to `true`, it enables keep-alive functionality
     on the socket immediately after a new incoming connection is received,
     similarly on what is done in \[`socket.setKeepAlive([enable][, initialDelay])`]\[`socket.setKeepAlive(enable, initialDelay)`].
diff --git a/doc/api/net.md b/doc/api/net.md
index 4ecab258011d7e..939e9c4a856c59 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -822,6 +822,10 @@ behavior.
 <!-- YAML
 added: v0.1.90
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/41310
+    description: The `noDelay`, `keepAlive` and `keepAliveInitialDelay`
+                 options are supported now.
   - version: v12.10.0
     pr-url: https://github.com/nodejs/node/pull/25436
     description: Added `onread` option.
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
index 28759a91c4f5a1..ff2047d4ea81bb 100644
--- a/lib/_http_agent.js
+++ b/lib/_http_agent.js
@@ -101,6 +101,9 @@ function Agent(options) {
 
   this.options = { __proto__: null, ...options };
 
+  if (this.options.noDelay === undefined)
+    this.options.noDelay = true;
+
   // Don't confuse net and make it think that we're connecting to a pipe
   this.options.path = null;
   this.requests = ObjectCreate(null);
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 18127f0d19b3d5..b3cdc87249c593 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -363,6 +363,9 @@ function storeHTTPOptions(options) {
   if (insecureHTTPParser !== undefined)
     validateBoolean(insecureHTTPParser, 'options.insecureHTTPParser');
   this.insecureHTTPParser = insecureHTTPParser;
+
+  if (options.noDelay === undefined)
+    options.noDelay = true;
 }
 
 function Server(options, requestListener) {
diff --git a/test/parallel/test-http-nodelay.js b/test/parallel/test-http-nodelay.js
new file mode 100644
index 00000000000000..7b259b73c2080d
--- /dev/null
+++ b/test/parallel/test-http-nodelay.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+const net = require('net');
+
+const originalConnect = net.Socket.prototype.connect;
+
+net.Socket.prototype.connect = common.mustCall(function(args) {
+  assert.strictEqual(args[0].noDelay, true);
+  return originalConnect.call(this, args);
+});
+
+const server = http.createServer(common.mustCall((req, res) => {
+  res.writeHead(200);
+  res.end();
+  server.close();
+}));
+
+server.listen(0, common.mustCall(() => {
+  assert.strictEqual(server.noDelay, true);
+
+  const req = http.request({
+    method: 'GET',
+    port: server.address().port
+  }, common.mustCall((res) => {
+    res.on('end', () => {
+      server.close();
+      res.req.socket.end();
+    });
+
+    res.resume();
+  }));
+
+  req.end();
+}));

From d368d2395450b08d81de6299bb6f171769ca810a Mon Sep 17 00:00:00 2001
From: Shogun <paolo@cowtech.it>
Date: Wed, 2 Mar 2022 13:59:10 +0100
Subject: [PATCH 2/2] doc: update option changelog

---
 doc/api/http.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/api/http.md b/doc/api/http.md
index 2cf04681a416e4..0c6214646fa32c 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -2838,6 +2838,9 @@ Found'`.
 <!-- YAML
 added: v0.1.13
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/42163
+    description: The `noDelay` option now defaults to `true`.
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/41310
     description: The `noDelay`, `keepAlive` and `keepAliveInitialDelay`