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

fix(http): don't create a blob out of ArrayBuffer when type is application/octet-stream (#13992) 

Closes #13973
This commit is contained in:
Dzmitry Shylovich 2017-01-19 03:01:02 +03:00 committed by Miško Hevery
parent 635bf02b02
commit 1200cf25f4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/@angular/http/src/static_request.ts
View File

@ -112,7 +112,7 @@ export class Request extends Body {
case 'text/html': case 'text/html':
return ContentType.TEXT; return ContentType.TEXT;
case 'application/octet-stream': case 'application/octet-stream':
return ContentType.BLOB; return this._body instanceof ArrayBuffer ? ContentType.ARRAY_BUFFER : ContentType.BLOB;
default: default:
return this.detectContentTypeFromBody(); return this.detectContentTypeFromBody();
} }
@ -132,7 +132,7 @@ export class Request extends Body {
return ContentType.BLOB; return ContentType.BLOB;
} else if (this._body instanceof ArrayBuffer) { } else if (this._body instanceof ArrayBuffer) {
return ContentType.ARRAY_BUFFER; return ContentType.ARRAY_BUFFER;
} else if (this._body && typeof this._body == 'object') { } else if (this._body && typeof this._body === 'object') {
return ContentType.JSON; return ContentType.JSON;
} else { } else {
return ContentType.TEXT; return ContentType.TEXT;
@ -167,4 +167,4 @@ const noop = function() {};
const w = typeof window == 'object' ? window : noop; const w = typeof window == 'object' ? window : noop;
const FormData = (w as any /** TODO #9100 */)['FormData'] || noop; const FormData = (w as any /** TODO #9100 */)['FormData'] || noop;
const Blob = (w as any /** TODO #9100 */)['Blob'] || noop; const Blob = (w as any /** TODO #9100 */)['Blob'] || noop;
const ArrayBuffer = (w as any /** TODO #9100 */)['ArrayBuffer'] || noop; export const ArrayBuffer = (w as any /** TODO #9100 */)['ArrayBuffer'] || noop;

13
modules/@angular/http/test/static_request_spec.ts
View File

@ -11,7 +11,7 @@ import {describe, expect, it} from '@angular/core/testing/testing_internal';
import {RequestOptions} from '../src/base_request_options'; import {RequestOptions} from '../src/base_request_options';
import {ContentType} from '../src/enums'; import {ContentType} from '../src/enums';
import {Headers} from '../src/headers'; import {Headers} from '../src/headers';
import {Request} from '../src/static_request'; import {ArrayBuffer, Request} from '../src/static_request';
export function main() { export function main() {
describe('Request', () => { describe('Request', () => {
@ -76,6 +76,17 @@ export function main() {
expect(req.detectContentType()).toEqual(ContentType.BLOB); expect(req.detectContentType()).toEqual(ContentType.BLOB);
}); });
it('should not create a blob out of ArrayBuffer', () => {
const req = new Request(new RequestOptions({
url: 'test',
method: 'GET',
body: new ArrayBuffer(1),
headers: new Headers({'content-type': 'application/octet-stream'})
}));
expect(req.detectContentType()).toEqual(ContentType.ARRAY_BUFFER);
});
}); });
it('should return empty string if no body is present', () => { it('should return empty string if no body is present', () => {