Skip to content

http: deprecate legacy array header notation #1292

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
wants to merge 1 commit into from
Closed

http: deprecate legacy array header notation #1292

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
50 changes: 30 additions & 20 deletions lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,26 @@ OutgoingMessage.prototype._buffer = function(data, encoding, callback) {
};


// Deprecated legacy API (316e283).
const convertLegacyArrayHeaders = util.deprecate(function(headers) {
var objHeaders = {};

for (var i = 0; i < headers.length; i++) {
var key = headers[i][0];
var value = headers[i][1];

if (Array.isArray(objHeaders[key]))
objHeaders[key].push(value);
else if (objHeaders[key] != null)
objHeaders[key] = [objHeaders[key], value];
else
objHeaders[key] = value;
}

return objHeaders;
}, 'http header array notation is deprecated. Use object notation instead.');


OutgoingMessage.prototype._storeHeader = function(firstLine, headers) {
// firstLine in the case of request is: 'GET /index.html HTTP/1.1\r\n'
// in the case of response it is: 'HTTP/1.1 200 OK\r\n'
Expand All @@ -191,21 +211,17 @@ OutgoingMessage.prototype._storeHeader = function(firstLine, headers) {
messageHeader: firstLine
};

if (Array.isArray(headers))
headers = convertLegacyArrayHeaders(headers);

if (headers) {
var keys = Object.keys(headers);
var isArray = Array.isArray(headers);
var field, value;

for (var i = 0, l = keys.length; i < l; i++) {
var key = keys[i];
if (isArray) {
field = headers[key][0];
value = headers[key][1];
} else {
field = key;
value = headers[key];
}
var field = keys[i];
var value = headers[field];

// Case: multiple values for one header.
if (Array.isArray(value)) {
for (var j = 0; j < value.length; j++) {
storeHeader(this, state, field, value[j]);
Expand Down Expand Up @@ -476,21 +492,15 @@ OutgoingMessage.prototype.write = function(chunk, encoding, callback) {


OutgoingMessage.prototype.addTrailers = function(headers) {
if (Array.isArray(headers))
headers = convertLegacyArrayHeaders(headers);

this._trailer = '';
var keys = Object.keys(headers);
var isArray = Array.isArray(headers);
var field, value;
for (var i = 0, l = keys.length; i < l; i++) {
var key = keys[i];
if (isArray) {
field = headers[key][0];
value = headers[key][1];
} else {
field = key;
value = headers[key];
}

this._trailer += field + ': ' + value + CRLF;
this._trailer += key + ': ' + headers[key] + CRLF;
}
};

Expand Down