godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35124 from Faless/js/http_server_fix

Browse Source 
Properly close files served by debug HTTP server.
This commit is contained in:
Rémi Verschelde 2020-01-14 18:38:16 +01:00 committed by GitHub
commit 16860e90f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platform/javascript/export/export.cpp
View File

@ -87,16 +87,22 @@ public:
String filepath = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_js_export"); String filepath = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_js_export");
String basereq = "/tmp_js_export"; String basereq = "/tmp_js_export";
String ctype = "";
if (req[1] == basereq + ".html") { if (req[1] == basereq + ".html") {
filepath += ".html"; filepath += ".html";
ctype = "text/html";
} else if (req[1] == basereq + ".js") { } else if (req[1] == basereq + ".js") {
filepath += ".js"; filepath += ".js";
ctype = "application/javascript";
} else if (req[1] == basereq + ".pck") { } else if (req[1] == basereq + ".pck") {
filepath += ".pck"; filepath += ".pck";
ctype = "application/octet-stream";
} else if (req[1] == basereq + ".png") { } else if (req[1] == basereq + ".png") {
filepath += ".png"; filepath += ".png";
ctype = "image/png";
} else if (req[1] == basereq + ".wasm") { } else if (req[1] == basereq + ".wasm") {
filepath += ".wasm"; filepath += ".wasm";
ctype = "application/wasm";
} else { } else {
String s = "HTTP/1.1 404 Not Found\r\n"; String s = "HTTP/1.1 404 Not Found\r\n";
s += "Connection: Close\r\n"; s += "Connection: Close\r\n";
@ -109,10 +115,14 @@ public:
ERR_FAIL_COND(!f); ERR_FAIL_COND(!f);
String s = "HTTP/1.1 200 OK\r\n"; String s = "HTTP/1.1 200 OK\r\n";
s += "Connection: Close\r\n"; s += "Connection: Close\r\n";
s += "Content-Type: " + ctype + "\r\n";
s += "\r\n"; s += "\r\n";
CharString cs = s.utf8(); CharString cs = s.utf8();
Error err = connection->put_data((const uint8_t *)cs.get_data(), cs.size() - 1); 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) { while (true) {
uint8_t bytes[4096]; uint8_t bytes[4096];
@ -121,9 +131,13 @@ public:
break; break;
} }
err = connection->put_data(bytes, read); err = connection->put_data(bytes, read);
ERR_FAIL_COND(err != OK); if (err != OK) {
memdelete(f);
ERR_FAIL();
} }
} }
memdelete(f);
}
void poll() { void poll() {
if (!server->is_listening()) if (!server->is_listening())