Skip to content

Fixes request headers to conform to spec more closely. #82

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

Merged
merged 2 commits into from
Oct 11, 2015
Merged

Fixes request headers to conform to spec more closely. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94bc55f
Fixes request headers to conform to spec more closely.
jacwright Aug 8, 2014
4610298
Updates tests to test header changes.
jacwright Aug 8, 2014
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
21 changes: 15 additions & 6 deletions lib/XMLHttpRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ exports.XMLHttpRequest = function() {
"Accept": "*/*",
};

var headers = defaultHeaders;
var headers = {};
var headersCase = {};

// These headers are not user setable.
// The following are allowed but banned in the spec:
Expand Down Expand Up @@ -177,7 +178,7 @@ exports.XMLHttpRequest = function() {
};

/**
* Sets a header for the request.
* Sets a header for the request or appends the value if one is already set.
*
* @param string header Header name
* @param string value Header value
Expand All @@ -193,7 +194,9 @@ exports.XMLHttpRequest = function() {
if (sendFlag) {
throw "INVALID_STATE_ERR: send flag is true";
}
headers[header] = value;
header = headersCase[header.toLowerCase()] || header;
headersCase[header.toLowerCase()] = header;
headers[header] = headers[header] ? headers[header] + ', ' + value : value;
};

/**
Expand Down Expand Up @@ -243,9 +246,8 @@ exports.XMLHttpRequest = function() {
* @return string Returns the request header or empty string if not set
*/
this.getRequestHeader = function(name) {
// @TODO Make this case insensitive
if (typeof name === "string" && headers[name]) {
return headers[name];
if (typeof name === "string" && headersCase[name.toLowerCase()]) {
return headers[headersCase[name.toLowerCase()]];
}

return "";
Expand Down Expand Up @@ -325,6 +327,13 @@ exports.XMLHttpRequest = function() {
// Add query string if one is used
var uri = url.pathname + (url.search ? url.search : '');

// Set the defaults if they haven't been set
for (var name in defaultHeaders) {
if (!headersCase[name.toLowerCase()]) {
headers[name] = defaultHeaders[name];
}
}

// Set the Host header or the server may reject the request
headers["Host"] = host;
if (!((ssl && port === 443) || port === 80)) {
Expand Down
4 changes: 4 additions & 0 deletions tests/test-headers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,16 @@ try {
xhr.open("GET", "http://localhost:8000/");
// Valid header
xhr.setRequestHeader("X-Test", "Foobar");
xhr.setRequestHeader("X-Test2", "Foobar1");
xhr.setRequestHeader("X-Test2", "Foobar2");
// Invalid header
xhr.setRequestHeader("Content-Length", 0);
// Allowed header outside of specs
xhr.setRequestHeader("user-agent", "node-XMLHttpRequest-test");
// Test getRequestHeader
assert.equal("Foobar", xhr.getRequestHeader("X-Test"));
assert.equal("Foobar", xhr.getRequestHeader("x-tEST"));
assert.equal("Foobar1, Foobar2", xhr.getRequestHeader("x-test2"));
// Test invalid header
assert.equal("", xhr.getRequestHeader("Content-Length"));

Expand Down