alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/http_digest_auth' into 'master'

Browse Source 
esp_http_client: Include port in host field, fix return type in API declaration

Closes IDFGH-1344

See merge request espressif/esp-idf!10590
This commit is contained in:
Mahavir Jain 2020-10-01 16:47:26 +08:00
commit 92b72aa6c8
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
components/esp_http_client/esp_http_client.c
View File

@ -513,11 +513,27 @@ static esp_err_t esp_http_client_prepare(esp_http_client_handle_t client)
return ESP_OK; return ESP_OK;
} }
static char *_get_host_header(char *host, int port)
{
int err = 0;
char *host_name;
if (port != DEFAULT_HTTP_PORT && port != DEFAULT_HTTPS_PORT) {
err = asprintf(&host_name, "%s:%d", host, port);
} else {
err = asprintf(&host_name, "%s", host);
}
if (err == -1) {
return NULL;
}
return host_name;
}
esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *config) esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *config)
{ {
esp_http_client_handle_t client; esp_http_client_handle_t client;
esp_transport_handle_t tcp; esp_transport_handle_t tcp;
char *host_name;
bool _success; bool _success;
_success = ( _success = (
@ -595,22 +611,37 @@ esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *co
} }
if (config->host != NULL && config->path != NULL) { if (config->host != NULL && config->path != NULL) {
host_name = _get_host_header(client->connection_info.host, client->connection_info.port);
if (host_name == NULL) {
ESP_LOGE(TAG, "Failed to allocate memory for host header");
goto error;
}
_success = ( _success = (
(esp_http_client_set_header(client, "User-Agent", DEFAULT_HTTP_USER_AGENT) == ESP_OK) && (esp_http_client_set_header(client, "User-Agent", DEFAULT_HTTP_USER_AGENT) == ESP_OK) &&
(esp_http_client_set_header(client, "Host", client->connection_info.host) == ESP_OK) (esp_http_client_set_header(client, "Host", host_name) == ESP_OK)
); );
free(host_name);
if (!_success) { if (!_success) {
ESP_LOGE(TAG, "Error while setting default configurations"); ESP_LOGE(TAG, "Error while setting default configurations");
goto error; goto error;
} }
} else if (config->url != NULL) { } else if (config->url != NULL) {
if (esp_http_client_set_url(client, config->url) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set URL");
goto error;
}
host_name = _get_host_header(client->connection_info.host, client->connection_info.port);
if (host_name == NULL) {
ESP_LOGE(TAG, "Failed to allocate memory for host header");
goto error;
}
_success = ( _success = (
(esp_http_client_set_url(client, config->url) == ESP_OK) &&
(esp_http_client_set_header(client, "User-Agent", DEFAULT_HTTP_USER_AGENT) == ESP_OK) && (esp_http_client_set_header(client, "User-Agent", DEFAULT_HTTP_USER_AGENT) == ESP_OK) &&
(esp_http_client_set_header(client, "Host", client->connection_info.host) == ESP_OK) (esp_http_client_set_header(client, "Host", host_name) == ESP_OK)
); );
free(host_name);
if (!_success) { if (!_success) {
ESP_LOGE(TAG, "Error while setting default configurations"); ESP_LOGE(TAG, "Error while setting default configurations");
goto error; goto error;

2
components/esp_http_client/include/esp_http_client.h
View File

@ -537,7 +537,7 @@ int esp_http_client_read_response(esp_http_client_handle_t client, char *buffer,
* - ESP_FAIL If failed to read response * - ESP_FAIL If failed to read response
* - ESP_ERR_INVALID_ARG If the client is NULL * - ESP_ERR_INVALID_ARG If the client is NULL
*/ */
int esp_http_client_flush_response(esp_http_client_handle_t client, int *len); esp_err_t esp_http_client_flush_response(esp_http_client_handle_t client, int *len);
/** /**
* @brief Get URL from client * @brief Get URL from client