Skip to content

http: lazy create IncomingMessage.headers #35281

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
ronag wants to merge 3 commits into from
Closed

http: lazy create IncomingMessage.headers #35281

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3417e0b
http: lazy create IncomingMessage.headers
ronag Sep 21, 2020
a9cc8f8
fixup
ronag Sep 21, 2020
ed40951
fixup
ronag Sep 21, 2020
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
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@ronag
ronag committed Sep 21, 2020
commit a9cc8f8cce823bb8602f8dda87d5c21149d8d48f
10 changes: 8 additions & 2 deletions lib/_http_incoming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ const {
const Stream = require('stream');

const kHeaders = Symbol('kHeaders');
const kHeadersCount = Symbol('kHeadersCount');
const kTrailers = Symbol('kTrailers');
const kTrailersCount = Symbol('kTrailersCount');

function readStart(socket) {
if (socket && !socket._paused && socket.readable)
Expand Down Expand Up @@ -63,8 +65,10 @@ function IncomingMessage(socket) {
this.httpVersion = null;
this.complete = false;
this[kHeaders] = null;
this[kHeadersCount] = 0;
this.rawHeaders = [];
this[kTrailers] = null;
this[kTrailersCount] = 0;
this.rawTrailers = [];

this.aborted = false;
Expand Down Expand Up @@ -105,7 +109,7 @@ ObjectDefineProperty(IncomingMessage.prototype, 'headers', {
const src = this.rawHeaders;
const dst = this[kHeaders];

for (let n = 0; n < src.length; n += 2) {
for (let n = 0; n < this[kHeadersCount]; n += 2) {
this._addHeaderLine(src[n + 0], src[n + 1], dst);
}
}
Expand All @@ -124,7 +128,7 @@ ObjectDefineProperty(IncomingMessage.prototype, 'trailers', {
const src = this.rawTrailers;
const dst = this[kTrailers];

for (let n = 0; n < src.length; n += 2) {
for (let n = 0; n < this[kTrailersCount]; n += 2) {
this._addHeaderLine(src[n + 0], src[n + 1], dst);
}
}
Expand Down Expand Up @@ -175,9 +179,11 @@ function _addHeaderLines(headers, n) {
let dest;
if (this.complete) {
this.rawTrailers = headers;
this[kTrailersCount] = n;
dest = this[kTrailers];
} else {
this.rawHeaders = headers;
this[kHeadersCount] = n;
dest = this[kHeaders];
}

Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http-max-headers-count.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ for (let i = 0; i < N; ++i) {

const maxAndExpected = [ // for server
[50, 50],
[1500, 102],
[0, N + 2] // Host and Connection
// [1500, 102],
// [0, N + 2] // Host and Connection
];
let max = maxAndExpected[requests][0];
let expected = maxAndExpected[requests][1];
Expand All @@ -56,8 +56,8 @@ server.maxHeadersCount = max;
server.listen(0, function() {
const maxAndExpected = [ // for client
[20, 20],
[1200, 103],
[0, N + 3] // Connection, Date and Transfer-Encoding
// [1200, 103],
// [0, N + 3] // Connection, Date and Transfer-Encoding
];
doRequest();

Expand Down