Skip to content

fix: only set keep-alive when not exists #35138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
atian25 wants to merge 1 commit into from
Closed

fix: only set keep-alive when not exists #35138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: only set keep-alive when not exists
  • Loading branch information
@atian25
atian25 committed Sep 8, 2020
commit 405c7fc809bca4e1e0708dea941869836d20ca6a
8 changes: 6 additions & 2 deletions lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ function OutgoingMessage() {
this._last = false;
this.chunkedEncoding = false;
this.shouldKeepAlive = true;
this._defaultKeepAlive = true;
this.useChunkedEncodingByDefault = true;
this.sendDate = false;
this._removedConnection = false;
Expand Down Expand Up @@ -427,8 +428,8 @@ function _storeHeader(firstLine, headers) {
(state.contLen || this.useChunkedEncodingByDefault || this.agent);
if (shouldSendKeepAlive) {
header += 'Connection: keep-alive\r\n';
if (this._keepAliveTimeout) {
const timeoutSeconds = MathFloor(this._keepAliveTimeout) / 1000;
if (this._keepAliveTimeout && this._defaultKeepAlive) {
const timeoutSeconds = MathFloor(this._keepAliveTimeout / 1000);
Copy link
Contributor

@fengmk2 fengmk2 Oct 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

header += `Keep-Alive: timeout=${timeoutSeconds}\r\n`;
}
} else {
Expand Down Expand Up @@ -524,6 +525,9 @@ function matchHeader(self, state, field, value) {
case 'trailer':
state[field] = true;
break;
case 'keep-alive':
self._defaultKeepAlive = false;
break;
}
}

Expand Down
31 changes: 31 additions & 0 deletions test/parallel/test-http-keep-alive-timeout-custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

const common = require('../common');
const http = require('http');
const assert = require('assert');

const server = http.createServer(common.mustCall((req, res) => {
const body = 'hello world\n';

res.writeHead(200, {
'Content-Length': body.length,
'Keep-Alive': 'timeout=50'
});
res.write(body);
res.end();
}));
server.keepAliveTimeout = 12010;

const agent = new http.Agent({ maxSockets: 1, keepAlive: true });

server.listen(0, common.mustCall(function() {
http.get({
path: '/', port: this.address().port, agent: agent
}, common.mustCall((response) => {
response.resume();
assert.strictEqual(
response.headers['keep-alive'], 'timeout=50');
server.close();
agent.destroy();
}));
}));
2 changes: 1 addition & 1 deletion test/parallel/test-http-keep-alive-timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const server = http.createServer(common.mustCall((req, res) => {
res.write(body);
res.end();
}));
server.keepAliveTimeout = 12000;
server.keepAliveTimeout = 12010;

const agent = new http.Agent({ maxSockets: 1, keepAlive: true });

Expand Down