iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(http): create a copy of headers when merge options (#13365) 

Closes #11980
This commit is contained in:
Dzmitry Shylovich 2016-12-12 22:16:34 +03:00 committed by Victor Berchet
parent 56dce0e26d
commit 2e500cc85b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/http/src/base_request_options.ts
View File

@ -121,7 +121,7 @@ export class RequestOptions {
merge(options?: RequestOptionsArgs): RequestOptions { merge(options?: RequestOptionsArgs): RequestOptions {
return new RequestOptions({ return new RequestOptions({
method: options && options.method != null ? options.method : this.method, method: options && options.method != null ? options.method : this.method,
headers: options && options.headers != null ? options.headers : this.headers, headers: options && options.headers != null ? options.headers : new Headers(this.headers),
body: options && options.body != null ? options.body : this.body, body: options && options.body != null ? options.body : this.body,
url: options && options.url != null ? options.url : this.url, url: options && options.url != null ? options.url : this.url,
params: options && this._mergeSearchParams(options.params || options.search), params: options && this._mergeSearchParams(options.params || options.search),

7
modules/@angular/http/test/base_request_options_spec.ts
View File

@ -9,6 +9,7 @@
import {describe, expect, it} from '@angular/core/testing/testing_internal'; import {describe, expect, it} from '@angular/core/testing/testing_internal';
import {BaseRequestOptions, RequestOptions} from '../src/base_request_options'; import {BaseRequestOptions, RequestOptions} from '../src/base_request_options';
import {RequestMethod} from '../src/enums'; import {RequestMethod} from '../src/enums';
import {Headers} from '../src/headers';
export function main() { export function main() {
describe('BaseRequestOptions', () => { describe('BaseRequestOptions', () => {
@ -45,5 +46,11 @@ export function main() {
expect(options2.params.paramsMap.get('b')).toEqual(['text']); expect(options2.params.paramsMap.get('b')).toEqual(['text']);
expect(options2.params.paramsMap.get('c')).toEqual(['1', '2', '3']); expect(options2.params.paramsMap.get('c')).toEqual(['1', '2', '3']);
}); });
it('should create a new headers object when calling merge', () => {
const options1 = new RequestOptions({headers: new Headers()});
const options2 = options1.merge();
expect(options2.headers).not.toBe(options1.headers);
});
}); });
} }