nodejs
diff --git a/‎lib/_http_outgoing.js‎
Lines changed: 3 additions & 2 deletions b/‎lib/_http_outgoing.js‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎lib/_http_server.js‎
Lines changed: 0 additions & 1 deletion b/‎lib/_http_server.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎test/parallel/test-http-keep-alive-max-requests.js‎
Lines changed: 2 additions & 2 deletions b/‎test/parallel/test-http-keep-alive-max-requests.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/parallel/test-http-keep-alive-pipeline-max-requests.js‎
Lines changed: 3 additions & 3 deletions b/‎test/parallel/test-http-keep-alive-pipeline-max-requests.js‎
Lines changed: 3 additions & 3 deletions
@@ -135,7 +135,6 @@ function OutgoingMessage() {
   this._header = null;
   this[kOutHeaders] = null;
 
-  this._maxRequestsPerSocket = null;
   this._keepAliveTimeout = 0;
 
   this._onPendingData = nop;
@@ -448,7 +447,9 @@ function _storeHeader(firstLine, headers) {
   } else if (!state.connection) {
     const shouldSendKeepAlive = this.shouldKeepAlive &&
         (state.contLen || this.useChunkedEncodingByDefault || this.agent);
-    if (shouldSendKeepAlive) {
+    if (shouldSendKeepAlive && this.maxRequestsOnConnectionReached) {
+      header += 'Connection: close\r\n';
+    } else if (shouldSendKeepAlive) {
       header += 'Connection: keep-alive\r\n';
       if (this._keepAliveTimeout && this._defaultKeepAlive) {
         const timeoutSeconds = MathFloor(this._keepAliveTimeout / 1000);
 
@@ -877,7 +877,6 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
 
   const res = new server[kServerResponse](req);
   res._keepAliveTimeout = server.keepAliveTimeout;
-  res._maxRequestsPerSocket = server.maxRequestsPerSocket;
   res._onPendingData = updateOutgoingData.bind(undefined,
                                                socket, state);
 
 
@@ -10,11 +10,11 @@ const bodySent = 'This is my request';
 function assertResponse(headers, body, expectClosed) {
   if (expectClosed) {
     assert.match(headers, /Connection: close\r\n/m);
-    assert.strictEqual(headers.search(/Keep-Alive: timeout=5, max=3\r\n/m), -1);
+    assert.strictEqual(headers.search(/Keep-Alive: timeout=5\r\n/m), -1);
     assert.match(body, /Hello World!/m);
   } else {
     assert.match(headers, /Connection: keep-alive\r\n/m);
-    assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
+    assert.match(headers, /Keep-Alive: timeout=5\r\n/m);
     assert.match(body, /Hello World!/m);
   }
 }
 
@@ -10,11 +10,11 @@ const bodySent = 'This is my request';
 function assertResponse(headers, body, expectClosed) {
   if (expectClosed) {
     assert.match(headers, /Connection: close\r\n/m);
-    assert.strictEqual(headers.search(/Keep-Alive: timeout=5, max=3\r\n/m), -1);
+    assert.strictEqual(headers.search(/Keep-Alive: timeout=5\r\n/m), -1);
     assert.match(body, /Hello World!/m);
   } else {
     assert.match(headers, /Connection: keep-alive\r\n/m);
-    assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
+    assert.match(headers, /Keep-Alive: timeout=5\r\n/m);
     assert.match(body, /Hello World!/m);
   }
 }
@@ -75,7 +75,7 @@ server.listen(0, common.mustCall((res) => {
 
       assert.match(responseParts[6], /HTTP\/1\.1 503 Service Unavailable/m);
       assert.match(responseParts[6], /Connection: close\r\n/m);
-      assert.strictEqual(responseParts[6].search(/Keep-Alive: timeout=5, max=3\r\n/m), -1);
+      assert.strictEqual(responseParts[6].search(/Keep-Alive: timeout=5\r\n/m), -1);
       assert.strictEqual(responseParts[7].search(/Hello World!/m), -1);
 
       socket.end();
Original file line number	Diff line number	Diff line change
@@ -10,11 +10,11 @@ const bodySent = 'This is my request';
10	10	function assertResponse(headers, body, expectClosed) {
11	11	if (expectClosed) {
12	12	assert.match(headers, /Connection: close\r\n/m);
13		- assert.strictEqual(headers.search(/Keep-Alive: timeout=5, max=3\r\n/m), -1);
	13	+ assert.strictEqual(headers.search(/Keep-Alive: timeout=5\r\n/m), -1);
14	14	assert.match(body, /Hello World!/m);
15	15	} else {
16	16	assert.match(headers, /Connection: keep-alive\r\n/m);
17		- assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
	17	+ assert.match(headers, /Keep-Alive: timeout=5\r\n/m);
18	18	assert.match(body, /Hello World!/m);
19	19	}
20	20	}