diff --git a/components/esp_http_client/lib/http_utils.c b/components/esp_http_client/lib/http_utils.c
index 174be8764c..adf47ac91a 100644
--- a/components/esp_http_client/lib/http_utils.c
+++ b/components/esp_http_client/lib/http_utils.c
@@ -116,11 +116,11 @@ void http_utils_trim_whitespace(char **str)
 
 char *http_utils_get_string_between(const char *str, const char *begin, const char *end)
 {
-    char *found = strstr(str, begin);
+    char *found = strcasestr(str, begin);
     char *ret = NULL;
     if (found) {
         found += strlen(begin);
-        char *found_end = strstr(found, end);
+        char *found_end = strcasestr(found, end);
         if (found_end) {
             ret = calloc(1, found_end - found + 1);
             mem_check(ret);
@@ -141,7 +141,7 @@ int http_utils_str_starts_with(const char *str, const char *start)
         return -1;
     }
     for (i = 0; i < start_len; i++) {
-        if (str[i] != start[i]) {
+        if (tolower(str[i]) != tolower(start[i])) {
             return 1;
         }
     }
diff --git a/components/esp_https_ota/src/esp_https_ota.c b/components/esp_https_ota/src/esp_https_ota.c
index a1607d1742..ebe9c23dd7 100644
--- a/components/esp_https_ota/src/esp_https_ota.c
+++ b/components/esp_https_ota/src/esp_https_ota.c
@@ -123,9 +123,9 @@ static esp_err_t _http_connect(esp_http_client_handle_t http_client)
                     ESP_LOGE(TAG, "Write failed");
                     return ESP_FAIL;
                 }
+                post_len -= write_len;
+                post_data += write_len;
             }
-            post_len -= write_len;
-            post_data += write_len;
         }
         header_ret = esp_http_client_fetch_headers(http_client);
         if (header_ret < 0) {