From d22992654bbc55ca8a6d316b5da6c0489eb3b387 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 24 Aug 2022 15:16:57 +0200 Subject: [PATCH 1/2] path to certs changed to folder res --- src/OTA.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OTA.c b/src/OTA.c index db7068d..0c57996 100644 --- a/src/OTA.c +++ b/src/OTA.c @@ -210,14 +210,14 @@ static void OTATask(void *pvParameter) struct espfs_stat_t stat; //open file - file = espfs_fopen(fs, "ca_cert.pem"); + file = espfs_fopen(fs, "res/ca_cert.pem"); if (!file) { ESP_LOGE(TAG, "Failed to read certificate file"); goto update_error; } //get file info - espfs_stat(fs, "ca_cert.pem", &stat); + espfs_stat(fs, "res/ca_cert.pem", &stat); uint32_t fileSize; fileSize = stat.size; char *certbuf = (char*) malloc(fileSize); From 4baa916c90319373ea5bc560bd77446b69e6bbf1 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 25 Aug 2022 16:10:08 +0200 Subject: [PATCH 2/2] fixed mangle woff2 files --- src/HTTPPostSystem.c | 14 +++++++------- src/HTTPServer.c | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c index 7dd53c4..3da6df9 100644 --- a/src/HTTPPostSystem.c +++ b/src/HTTPPostSystem.c @@ -27,13 +27,13 @@ static const char *TAG = "HTTPServerPost"; #define FILE_PATH_MAX (ESP_VFS_PATH_MAX + CONFIG_SPIFFS_OBJ_NAME_LEN) -const char url_eth_settings[] = "sys/set_eth.html"; -const char url_wifi_settings[] = "sys/set_wifi.html"; -const char url_gprs_settings[] = "sys/set_gprs.html"; -const char url_mqtt_settings[] = "sys/set_mqtt.html"; -const char url_sys_settings[] = "sys/set_sys.html"; -const char url_time_settings[] = "sys/set_time.html"; -const char url_reboot[] = "sys/reboot.html"; +const char url_eth_settings[] = "set_eth.html"; +const char url_wifi_settings[] = "set_wifi.html"; +const char url_gprs_settings[] = "set_gprs.html"; +const char url_mqtt_settings[] = "set_mqtt.html"; +const char url_sys_settings[] = "set_sys.html"; +const char url_time_settings[] = "set_time.html"; +const char url_reboot[] = "reboot.html"; static HTTP_IO_RESULT AfterPostHandler(httpd_req_t *req, const char *filename, char *PostData); diff --git a/src/HTTPServer.c b/src/HTTPServer.c index 03f8f47..8e5fd64 100644 --- a/src/HTTPServer.c +++ b/src/HTTPServer.c @@ -124,6 +124,10 @@ static esp_err_t set_content_type_from_file(httpd_req_t *req, { return httpd_resp_set_type(req, "text/css"); } + else if (IS_FILE_EXT(filename, ".woff2")) + { + return httpd_resp_set_type(req, "font/woff2"); + } /* This is a limited set only */ /* For any other type always set as plain text */ return httpd_resp_set_type(req, "text/plain"); @@ -305,12 +309,18 @@ static esp_err_t GETHandler(httpd_req_t *req) espfs_fclose(file); return ESP_FAIL; } + if (memmem(buf, 3, GZIP_SIGN, 3)) { httpd_resp_set_hdr(req, "Content-Encoding", "gzip"); httpd_resp_set_hdr(req, "Cache-Control", "max-age=600"); isCompressed = true; } + + //prevent mangle compressed font files + if (IS_FILE_EXT(filename, ".woff2")) + isCompressed = true; + int pt = 0; do {