kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve HTTPRequest default Content-Type

Browse Source
This commit is contained in:
Joshua Granick
2017-06-20 21:18:19 -07:00
parent 5f8c1712b1
commit 592e71fe47
2 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lime/_backend/html5/HTML5HTTPRequest.hx
View File

@@ -96,8 +96,11 @@ class HTML5HTTPRequest {
} }
request.open (Std.string (parent.method), uri, true); request.open (Std.string (parent.method), uri, true);
if (parent.timeout > 0) { if (parent.timeout > 0) {
request.timeout = parent.timeout; request.timeout = parent.timeout;
} }
if (binary) { if (binary) {
@@ -106,18 +109,45 @@ class HTML5HTTPRequest {
} }
var hasContentType = false; var contentType = null;
for (header in parent.headers) { for (header in parent.headers) {
if (header.name == "Content-Type") hasContentType = true; if (header.name == "Content-Type") {
contentType = header.value;
} else {
request.setRequestHeader (header.name, header.value); request.setRequestHeader (header.name, header.value);
} }
if (!hasContentType && parent.contentType != null) { }
request.setRequestHeader ("Content-Type", parent.contentType); if (parent.contentType != null) {
contentType = parent.contentType;
}
if (contentType == null) {
if (parent.data != null) {
contentType = "application/octet-stream";
} else if (query != "") {
contentType = "application/x-www-form-urlencoded";
}
}
if (contentType != null) {
request.setRequestHeader ("Content-Type", contentType);
} }

35
lime/_backend/native/NativeHTTPRequest.hx
View File

@@ -261,18 +261,45 @@ class NativeHTTPRequest {
var headers = []; var headers = [];
headers.push ("Expect: "); headers.push ("Expect: ");
var hasContentType = false; var contentType = null;
for (header in cast (parent.headers, Array<Dynamic>)) { for (header in cast (parent.headers, Array<Dynamic>)) {
if (header.name == "Content-Type") hasContentType = true; if (header.name == "Content-Type") {
contentType = header.value;
} else {
headers.push ('${header.name}: ${header.value}'); headers.push ('${header.name}: ${header.value}');
} }
if (!hasContentType) { }
headers.push ("Content-Type: " + parent.contentType); if (parent.contentType != null) {
contentType = parent.contentType;
}
if (contentType == null) {
if (parent.data != null) {
contentType = "application/octet-stream";
} else if (query != "") {
contentType = "application/x-www-form-urlencoded";
}
}
if (contentType != null) {
headers.push ("Content-Type: " + contentType);
} }