diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-11 11:08:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 11:08:08 +0100 |
| commit | ab4c3ddf3293f03305d9e960588e2ceaf041b8da (patch) | |
| tree | 82e370ecb4c9599064f47b5fce3ffb72be5d2db2 /platform/javascript/http_client_javascript.cpp | |
| parent | b3c7e38f4d4f62a1700209a55eaddcb553b1a328 (diff) | |
| parent | 75c4e2c5fa268a5d7017651c0238b25e11e5d4bb (diff) | |
| download | redot-engine-ab4c3ddf3293f03305d9e960588e2ceaf041b8da.tar.gz | |
Merge pull request #45888 from Faless/js/4.x_xhr_fix
[HTML5] Fix HTTPClient request_raw.
Diffstat (limited to 'platform/javascript/http_client_javascript.cpp')
| -rw-r--r-- | platform/javascript/http_client_javascript.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/platform/javascript/http_client_javascript.cpp b/platform/javascript/http_client_javascript.cpp index c8c48dd582..1136ea299d 100644 --- a/platform/javascript/http_client_javascript.cpp +++ b/platform/javascript/http_client_javascript.cpp @@ -104,7 +104,11 @@ Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector Error err = prepare_request(p_method, p_url, p_headers); if (err != OK) return err; - godot_xhr_send_data(xhr_id, p_body.ptr(), p_body.size()); + if (p_body.is_empty()) { + godot_xhr_send(xhr_id, nullptr, 0); + } else { + godot_xhr_send(xhr_id, p_body.ptr(), p_body.size()); + } return OK; } @@ -112,7 +116,12 @@ Error HTTPClient::request(Method p_method, const String &p_url, const Vector<Str Error err = prepare_request(p_method, p_url, p_headers); if (err != OK) return err; - godot_xhr_send_string(xhr_id, p_body.utf8().get_data()); + if (p_body.is_empty()) { + godot_xhr_send(xhr_id, nullptr, 0); + } else { + const CharString cs = p_body.utf8(); + godot_xhr_send(xhr_id, cs.get_data(), cs.length()); + } return OK; } |