nodejs
diff --git a/‎lib/_http_outgoing.js‎
Lines changed: 5 additions & 1 deletion b/‎lib/_http_outgoing.js‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎lib/_http_server.js‎
Lines changed: 1 addition & 0 deletions b/‎lib/_http_server.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/parallel/test-http-keep-alive-max-requests.js‎
Lines changed: 1 addition & 1 deletion b/‎test/parallel/test-http-keep-alive-max-requests.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/parallel/test-http-keep-alive-pipeline-max-requests.js‎
Lines changed: 2 additions & 2 deletions b/‎test/parallel/test-http-keep-alive-pipeline-max-requests.js‎
Lines changed: 2 additions & 2 deletions
@@ -463,7 +463,11 @@ function _storeHeader(firstLine, headers) {
       header += 'Connection: keep-alive\r\n';
       if (this._keepAliveTimeout && this._defaultKeepAlive) {
         const timeoutSeconds = MathFloor(this._keepAliveTimeout / 1000);
-        header += `Keep-Alive: timeout=${timeoutSeconds}\r\n`;
+        let max = '';
+        if (~~this._maxRequestsPerSocket > 0) {
+          max = `, max=${this._maxRequestsPerSocket}`;
+        }
+        header += `Keep-Alive: timeout=${timeoutSeconds}${max}\r\n`;
       }
     } else {
       this._last = true;
 
@@ -922,6 +922,7 @@ 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);
 
 
@@ -14,7 +14,7 @@ function assertResponse(headers, body, expectClosed) {
     assert.match(body, /Hello World!/m);
   } else {
     assert.match(headers, /Connection: keep-alive\r\n/m);
-    assert.match(headers, /Keep-Alive: timeout=5\r\n/m);
+    assert.match(headers, /Keep-Alive: timeout=5, max=3\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\r\n/m), -1);
+    assert.strictEqual(headers.search(/Keep-Alive: timeout=5, max=3\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\r\n/m);
+    assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
     assert.match(body, /Hello World!/m);
   }
 }
Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ function assertResponse(headers, body, expectClosed) {
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\r\n/m);
	17	+ assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
18	18	assert.match(body, /Hello World!/m);
19	19	}
20	20	}
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\r\n/m), -1);
	13	+ assert.strictEqual(headers.search(/Keep-Alive: timeout=5, max=3\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\r\n/m);
	17	+ assert.match(headers, /Keep-Alive: timeout=5, max=3\r\n/m);
18	18	assert.match(body, /Hello World!/m);
19	19	}
20	20	}