1 files changed, 28 insertions, 14 deletions

diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index bbdf6a1f57..9b93d4f140 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -87,16 +87,22 @@ public:
 
 		String filepath = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_js_export");
 		String basereq = "/tmp_js_export";
+		String ctype = "";
 		if (req[1] == basereq + ".html") {
 			filepath += ".html";
+			ctype = "text/html";
 		} else if (req[1] == basereq + ".js") {
 			filepath += ".js";
+			ctype = "application/javascript";
 		} else if (req[1] == basereq + ".pck") {
 			filepath += ".pck";
+			ctype = "application/octet-stream";
 		} else if (req[1] == basereq + ".png") {
 			filepath += ".png";
+			ctype = "image/png";
 		} else if (req[1] == basereq + ".wasm") {
 			filepath += ".wasm";
+			ctype = "application/wasm";
 		} else {
 			String s = "HTTP/1.1 404 Not Found\r\n";
 			s += "Connection: Close\r\n";
@@ -109,10 +115,14 @@ public:
 		ERR_FAIL_COND(!f);
 		String s = "HTTP/1.1 200 OK\r\n";
 		s += "Connection: Close\r\n";
+		s += "Content-Type: " + ctype + "\r\n";
 		s += "\r\n";
 		CharString cs = s.utf8();
 		Error err = connection->put_data((const uint8_t *)cs.get_data(), cs.size() - 1);
-		ERR_FAIL_COND(err != OK);
+		if (err != OK) {
+			memdelete(f);
+			ERR_FAIL();
+		}
 
 		while (true) {
 			uint8_t bytes[4096];
@@ -121,8 +131,12 @@ public:
 				break;
 			}
 			err = connection->put_data(bytes, read);
-			ERR_FAIL_COND(err != OK);
+			if (err != OK) {
+				memdelete(f);
+				ERR_FAIL();
+			}
 		}
+		memdelete(f);
 	}
 
 	void poll() {
@@ -288,32 +302,32 @@ Ref<Texture> EditorExportPlatformJavaScript::get_logo() const {
 
 bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 
-	bool valid = false;
 	String err;
+	bool valid = false;
 
-	if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE) != "")
-		valid = true;
-	else if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG) != "")
-		valid = true;
+	// Look for export templates (first official, and if defined custom templates).
+
+	bool dvalid = exists_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG, &err);
+	bool rvalid = exists_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE, &err);
 
 	if (p_preset->get("custom_template/debug") != "") {
-		if (FileAccess::exists(p_preset->get("custom_template/debug"))) {
-			valid = true;
-		} else {
+		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+		if (!dvalid) {
 			err += TTR("Custom debug template not found.") + "\n";
 		}
 	}
-
 	if (p_preset->get("custom_template/release") != "") {
-		if (FileAccess::exists(p_preset->get("custom_template/release"))) {
-			valid = true;
-		} else {
+		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+		if (!rvalid) {
 			err += TTR("Custom release template not found.") + "\n";
 		}
 	}
 
+	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
+	// Validate the rest of the configuration.
+
 	if (p_preset->get("vram_texture_compression/for_mobile")) {
 		String etc_error = test_etc2();
 		if (etc_error != String()) {