ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #757 from bartvde/ajax

Browse Source 
make sure config.headers does not overwrite DEFAULT_CONFIG.headers in OpenLayers.Request.issue (r=@ahocevar)
This commit is contained in:
Bart van den Eijnden
2012-11-13 07:15:12 -08:00
parent 57e22ef491 3265b0e73f
commit 1f229ba275
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Request.js
View File

@@ -173,8 +173,10 @@ OpenLayers.Util.extend(OpenLayers.Request, {
this.DEFAULT_CONFIG,
{proxy: OpenLayers.ProxyHost}
);
config = config || {};
config.headers = config.headers || {};
config = OpenLayers.Util.applyDefaults(config, defaultConfig);
config.headers = OpenLayers.Util.applyDefaults(config.headers, defaultConfig.headers);
// Always set the "X-Requested-With" header to signal that this request
// was issued through the XHR-object. Since header keys are case
// insensitive and we want to allow overriding of the "X-Requested-With"

30
tests/Request.html
View File

@@ -16,7 +16,35 @@
function teardown() {
OpenLayers.Request.XMLHttpRequest = window._xhr;
}
function test_defaultHeaders(t) {
setup();
t.plan(2);
var config = {
headers: {
x: 'y'
}
};
OpenLayers.Request.DEFAULT_CONFIG.headers = {
foo: 'bar'
};
var proto = OpenLayers.Request.XMLHttpRequest.prototype;
var issue = OpenLayers.Function.bind(OpenLayers.Request.issue,
OpenLayers.Request);
var headers = {};
var _setRequestHeader = proto.setRequestHeader;
proto.setRequestHeader = function(key, value) {
headers[key] = value;
};
request = issue(config);
t.eq(headers.foo, 'bar', "Header from DEFAULT_CONFIG set correctly");
t.eq(headers.x, 'y', "Header from config set correctly");
proto.setRequestHeader = _setRequestHeader;
OpenLayers.Request.DEFAULT_CONFIG.headers = {};
teardown();
}
function test_issue(t) {
setup();