1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send multiple header lines in ServerResponse#writeHead when header values are arrays

Browse Source
This commit is contained in:
Sam Stephenson 2010-09-15 09:52:23 -05:00 committed by Ryan Dahl
parent 6bdc42cee7
commit 6560ab9073
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/http.js
View File

@ -374,11 +374,35 @@ OutgoingMessage.prototype._storeHeader = function (firstLine, headers) {
// in the case of response it is: "HTTP/1.1 200 OK\r\n" // in the case of response it is: "HTTP/1.1 200 OK\r\n"
var messageHeader = firstLine; var messageHeader = firstLine;
var field, value; var field, value;
var self = this;
function store(field, value) {
messageHeader += field + ": " + value + CRLF;
if (connectionExpression.test(field)) {
sentConnectionHeader = true;
if (closeExpression.test(value)) {
self._last = true;
} else {
self.shouldKeepAlive = true;
}
} else if (transferEncodingExpression.test(field)) {
sentTransferEncodingHeader = true;
if (chunkExpression.test(value)) self.chunkedEncoding = true;
} else if (contentLengthExpression.test(field)) {
sentContentLengthHeader = true;
}
}
if (headers) { if (headers) {
var keys = Object.keys(headers); var keys = Object.keys(headers);
var isArray = (Array.isArray(headers)); var isArray = (Array.isArray(headers));
for (var i = 0, l = keys.length; i < l; i++) { var i, l;
for (i = 0, l = keys.length; i < l; i++) {
var key = keys[i]; var key = keys[i];
if (isArray) { if (isArray) {
field = headers[key][0]; field = headers[key][0];
@ -388,23 +412,12 @@ OutgoingMessage.prototype._storeHeader = function (firstLine, headers) {
value = headers[key]; value = headers[key];
} }
messageHeader += field + ": " + value + CRLF; if (Array.isArray(value)) {
for (i = 0, l = value.length; i < l; i++) {
if (connectionExpression.test(field)) { store(field, value[i]);
sentConnectionHeader = true;
if (closeExpression.test(value)) {
this._last = true;
} else {
this.shouldKeepAlive = true;
} }
} else {
} else if (transferEncodingExpression.test(field)) { store(field, value);
sentTransferEncodingHeader = true;
if (chunkExpression.test(value)) this.chunkedEncoding = true;
} else if (contentLengthExpression.test(field)) {
sentContentLengthHeader = true;
} }
} }
} }

8
test/simple/test-http-proxy.js
View File

@ -6,9 +6,14 @@ url = require("url");
var PROXY_PORT = common.PORT; var PROXY_PORT = common.PORT;
var BACKEND_PORT = common.PORT+1; var BACKEND_PORT = common.PORT+1;
var cookies = [
"session_token=; path=/; expires=Sun, 15-Sep-2030 13:48:52 GMT",
"prefers_open_id=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
];
var backend = http.createServer(function (req, res) { var backend = http.createServer(function (req, res) {
common.debug("backend request"); common.debug("backend request");
res.writeHead(200, {"content-type": "text/plain"}); res.writeHead(200, {"content-type": "text/plain", "set-cookie": cookies});
res.write("hello world\n"); res.write("hello world\n");
res.end(); res.end();
}); });
@ -43,6 +48,7 @@ function startReq () {
req.addListener('response', function (res) { req.addListener('response', function (res) {
common.debug("got res"); common.debug("got res");
assert.equal(200, res.statusCode); assert.equal(200, res.statusCode);
assert.deepEqual(cookies, res.headers["set-cookie"]);
res.setEncoding("utf8"); res.setEncoding("utf8");
res.addListener('data', function (chunk) { body += chunk; }); res.addListener('data', function (chunk) { body += chunk; });
res.addListener('end', function () { res.addListener('end', function () {