Merge branch 'bugfix/ws_client_fixed_path_query_uri' into 'master'
websocket_client: fix URI parsing to include also query part in websocket connection path See merge request espressif/esp-idf!6201
This commit is contained in:
commit
5d59895067
1 changed files with 9 additions and 2 deletions
|
@ -382,9 +382,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);
|
||||||
asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off);
|
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);
|
||||||
|
} 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) {
|
||||||
|
|
Loading…
Reference in a new issue