godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix HTML5 build after 67a4c30.

Browse Source 
I messed up a rebase and a commit was partly skipped
This commit is contained in:
Fabio Alessandrelli
2019-10-11 18:39:03 +02:00
parent 1fed266bf5
commit d75e0de729
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/websocket/emws_client.cpp
View File

@@ -64,9 +64,15 @@ EMSCRIPTEN_KEEPALIVE void _esws_on_close(void *obj, int code, char *reason, int
}
}
Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const PoolVector<String> p_protocols, const Vector<String> p_custom_headers) {
Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const Vector<String> p_protocols, const Vector<String> p_custom_headers) {
String proto_string;
for (int i = 0; i < p_protocols.size(); i++) {
if (i != 0)
proto_string += ",";
proto_string += p_protocols[i];
}
String proto_string = p_protocols.join(",");
String str = "ws://";
if (p_custom_headers.size()) {