From: Jitin George <jitin@espressif.com>
Date: Mon, 7 Jan 2019 08:33:41 +0000 (+0800)
Subject: Minor Bugfixes in esp_http_client, tcp_transport and simple_ota_example
X-Git-Tag: v3.3-beta2~123^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2ae69f6fb5d7dbc07aed687912682aa0a7af5b8;p=esp-idf

Minor Bugfixes in esp_http_client, tcp_transport and simple_ota_example
---

diff --git a/components/esp_http_client/esp_http_client.c b/components/esp_http_client/esp_http_client.c
index 0fa8d828d2..2f5c2e487d 100644
--- a/components/esp_http_client/esp_http_client.c
+++ b/components/esp_http_client/esp_http_client.c
@@ -166,7 +166,7 @@ enum HttpStatus_Code
 };
 
 
-static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client);
+static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client, int write_len);
 static esp_err_t esp_http_client_connect(esp_http_client_handle_t client);
 static esp_err_t esp_http_client_send_post_data(esp_http_client_handle_t client);
 
@@ -817,7 +817,7 @@ esp_err_t esp_http_client_perform(esp_http_client_handle_t client)
                 }
                 /* falls through */
             case HTTP_STATE_CONNECTED:
-                if ((err = esp_http_client_request_send(client)) != ESP_OK) {
+                if ((err = esp_http_client_request_send(client, client->post_len)) != ESP_OK) {
                     if (client->is_async && errno == EAGAIN) {
                         return ESP_ERR_HTTP_EAGAIN;
                     }
@@ -997,11 +997,11 @@ static int http_client_prepare_first_line(esp_http_client_handle_t client, int w
     return first_line_len;
 }
 
-static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client)
+static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client, int write_len)
 {
     int first_line_len = 0;
     if (!client->first_line_prepared) {
-        if ((first_line_len = http_client_prepare_first_line(client, client->post_len)) < 0) {
+        if ((first_line_len = http_client_prepare_first_line(client, write_len)) < 0) {
             return first_line_len;
         }
         client->first_line_prepared = true;
@@ -1092,7 +1092,7 @@ esp_err_t esp_http_client_open(esp_http_client_handle_t client, int write_len)
     if ((err = esp_http_client_connect(client)) != ESP_OK) {
         return err;
     }
-    if ((err = esp_http_client_request_send(client)) != ESP_OK) {
+    if ((err = esp_http_client_request_send(client, write_len)) != ESP_OK) {
         return err; 
     }
     return ESP_OK;
diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c
index f2d3467206..436f8a9436 100644
--- a/components/tcp_transport/transport_ssl.c
+++ b/components/tcp_transport/transport_ssl.c
@@ -110,7 +110,7 @@ static int ssl_write(esp_transport_handle_t t, const char *buffer, int len, int
         return poll;
     }
     ret = esp_tls_conn_write(ssl->tls, (const unsigned char *) buffer, len);
-    if (ret <= 0) {
+    if (ret < 0) {
         ESP_LOGE(TAG, "esp_tls_conn_write error, errno=%s", strerror(errno));
     }
     return ret;
@@ -127,7 +127,7 @@ static int ssl_read(esp_transport_handle_t t, char *buffer, int len, int timeout
         }
     }
     ret = esp_tls_conn_read(ssl->tls, (unsigned char *)buffer, len);
-    if (ret <= 0) {
+    if (ret < 0) {
         ESP_LOGE(TAG, "esp_tls_conn_read error, errno=%s", strerror(errno));
     }
     return ret;
diff --git a/examples/system/ota/simple_ota_example/README.md b/examples/system/ota/simple_ota_example/README.md
index 437964f741..a2629e1009 100644
--- a/examples/system/ota/simple_ota_example/README.md
+++ b/examples/system/ota/simple_ota_example/README.md
@@ -1,7 +1,7 @@
 # Simple OTA example
 
-This example is based on `http_firmware_upgrade` component's APIs.
+This example is based on `esp_https_ota` component's APIs.
 
 ## Configuration
 
-Refer README.md in the parent directory for setup details
\ No newline at end of file
+Refer README.md in the parent directory for setup details