Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-21 04:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($http): ensure case-insens. header overriding

Browse source 
If user send content-type header, both content-type and default
Content-Type headers were sent. Now default header overriding is
case-insensitive.
This commit is contained in:
Caio Cunha 2013-06-19 21:30:28 +01:00 committed by Pete Bacon Darwin
parent 1b234cb7af
commit 25d9f5a804
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/ng/http.js
View file

@ -482,17 +482,40 @@ function $HttpProvider() {
var reqTransformFn = config.transformRequest || $config.transformRequest, var reqTransformFn = config.transformRequest || $config.transformRequest,
respTransformFn = config.transformResponse || $config.transformResponse, respTransformFn = config.transformResponse || $config.transformResponse,
defHeaders = $config.headers, reqHeaders = extend({}, config.headers),
reqHeaders = extend({'X-XSRF-TOKEN': $browser.cookies()['XSRF-TOKEN']}, defHeaders = extend(
defHeaders.common, defHeaders[lowercase(config.method)], config.headers), {'X-XSRF-TOKEN': $browser.cookies()['XSRF-TOKEN']},
reqData = transformData(config.data, headersGetter(reqHeaders), reqTransformFn), $config.headers.common,
$config.headers[lowercase(config.method)]
),
reqData,
defHeaderName, lowercaseDefHeaderName, headerName,
promise; promise;
// using for-in instead of forEach to avoid unecessary iteration after header has been found
defaultHeadersIteration:
for(defHeaderName in defHeaders) {
lowercaseDefHeaderName = lowercase(defHeaderName);
for(headerName in config.headers) {
if (lowercase(headerName) === lowercaseDefHeaderName) {
continue defaultHeadersIteration;
}
}
reqHeaders[defHeaderName] = defHeaders[defHeaderName];
}
// strip content-type if data is undefined // strip content-type if data is undefined
if (isUndefined(config.data)) { if (isUndefined(config.data)) {
delete reqHeaders['Content-Type']; for(var header in reqHeaders) {
if (lowercase(header) === 'content-type') {
delete reqHeaders[header];
break;
}
}
} }
reqData = transformData(config.data, headersGetter(reqHeaders), reqTransformFn);
// send request // send request
promise = sendReq(config, reqData, reqHeaders); promise = sendReq(config, reqData, reqHeaders);

15
test/ng/httpSpec.js
View file

@ -430,6 +430,21 @@ describe('$http', function() {
}); });
it('should override default headers with custom in a case insensitive manner', function() {
$httpBackend.expect('POST', '/url', 'messageBody', function(headers) {
return headers['accept'] == 'Rewritten' &&
headers['content-type'] == 'Content-Type Rewritten' &&
headers['Accept'] === undefined &&
headers['Content-Type'] === undefined;
}).respond('');
$http({url: '/url', method: 'POST', data: 'messageBody', headers: {
'accept': 'Rewritten',
'content-type': 'Content-Type Rewritten'
}});
$httpBackend.flush();
});
it('should not send Content-Type header if request data/body is undefined', function() { it('should not send Content-Type header if request data/body is undefined', function() {
$httpBackend.expect('POST', '/url', undefined, function(headers) { $httpBackend.expect('POST', '/url', undefined, function(headers) {
return !headers.hasOwnProperty('Content-Type'); return !headers.hasOwnProperty('Content-Type');