Skip to content

Commit b105997

Browse files
keslatjfontaine
authored andcommitted
http: avoid duplicate keys in writeHead
Use setHeader in writeHead to avoid sending duplicate headers Fixes #5036
1 parent 845e5d3 commit b105997

File tree

2 files changed

+49
-4
lines changed

2 files changed

+49
-4
lines changed

lib/_http_server.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ ServerResponse.prototype.writeHead = function(statusCode) {
187187
var obj = arguments[headerIndex];
188188

189189
if (obj && this._headers) {
190-
// Slow-case: when progressive API and header fields are passed.
191-
headers = this._renderHeaders();
192-
193190
if (util.isArray(obj)) {
194191
// handle array case
195192
// TODO: remove when array is no longer accepted
@@ -207,8 +204,10 @@ ServerResponse.prototype.writeHead = function(statusCode) {
207204
var keys = Object.keys(obj);
208205
for (var i = 0; i < keys.length; i++) {
209206
var k = keys[i];
210-
if (k) headers[k] = obj[k];
207+
if (k) this.setHeader(k, obj[k]);
211208
}
209+
// Slow-case: when progressive API and header fields are passed.
210+
headers = this._renderHeaders();
212211
}
213212
} else if (this._headers) {
214213
// only progressive api is used

test/simple/test-http-write-head.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var http = require('http');
25+
26+
// Verify that ServerResponse.writeHead() works as setHeader.
27+
// Issue 5036 on github.
28+
29+
var s = http.createServer(function(req, res) {
30+
res.setHeader('test', '1');
31+
res.writeHead(200, { Test: '2' });
32+
res.end();
33+
});
34+
35+
s.listen(common.PORT, runTest);
36+
37+
function runTest() {
38+
http.get({ port: common.PORT }, function(response) {
39+
response.on('end', function() {
40+
assert.equal(response.headers['test'], '2');
41+
assert(response.rawHeaders.indexOf('Test') !== -1);
42+
s.close();
43+
});
44+
response.resume();
45+
});
46+
}

0 commit comments

Comments
 (0)