espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-23 23:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

websocket_client: fix URI parsing to include also query part in websocket connection path

Browse Source 
closes https://github.com/espressif/esp-idf/issues/4090


* Original commit: espressif/esp-idf@271e6c4c9c
This commit is contained in:
David Cermak
2019-09-25 15:30:01 +02:00
committed by gabsuren
parent 23f6a1d46e
commit f5a26c4d32
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_websocket_client/esp_websocket_client.c
View File

@ -381,9 +381,16 @@ esp_err_t esp_websocket_client_set_uri(esp_websocket_client_handle_t client, con
} }
if (puri.field_data[UF_PATH].len) { if (puri.field_data[UF_PATH].len || puri.field_data[UF_QUERY].len) {
free(client->config->path); free(client->config->path);
if (puri.field_data[UF_QUERY].len == 0) {
asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off); asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off);
} else if (puri.field_data[UF_PATH].len == 0) {
asprintf(&client->config->path, "/?%.*s", puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
} else {
asprintf(&client->config->path, "%.*s?%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off,
puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
}
ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->path, return ESP_ERR_NO_MEM); ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->path, return ESP_ERR_NO_MEM);
} }
if (puri.field_data[UF_PORT].off) { if (puri.field_data[UF_PORT].off) {