From 27c731c7b65d968723f1b84eade91e885607b021 Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Fri, 17 May 2024 20:40:17 +0200
Subject: [PATCH] Avoid connection errors when switching to safeboot to upload
 OTA firmware (#21428)

---
 CHANGELOG.md                                        | 1 +
 tasmota/html_compressed/HTTP_HEAD_LAST_SCRIPT32.h   | 9 +++++----
 tasmota/html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 320237e81f40..944325dc5e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 (#21281)
 - Watchdog restart or freeze if ``displaytext`` is more than 128 characters (#21401)
+- Avoid connection errors when switching to safeboot to upload OTA firmware
 
 ### Removed
 - Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)
diff --git a/tasmota/html_compressed/HTTP_HEAD_LAST_SCRIPT32.h b/tasmota/html_compressed/HTTP_HEAD_LAST_SCRIPT32.h
index fcf228aad6df..3c13039509c9 100644
--- a/tasmota/html_compressed/HTTP_HEAD_LAST_SCRIPT32.h
+++ b/tasmota/html_compressed/HTTP_HEAD_LAST_SCRIPT32.h
@@ -2,7 +2,7 @@
 // compressed by tools/unishox/compress-html-uncompressed.py
 /////////////////////////////////////////////////////////////////////
 
-const size_t HTTP_HEAD_LAST_SCRIPT32_SIZE = 989;
+const size_t HTTP_HEAD_LAST_SCRIPT32_SIZE = 1013;
 const char HTTP_HEAD_LAST_SCRIPT32_COMPRESSED[] PROGMEM = "\x30\x2F\x83\xAD\xCE\x46\xB1\x0E\xE9\xDE\x3D\xA6\x77\xF5\x47\xC3\x8C\xEA\x2D\x3E"
                              "\x09\x81\x8B\x1A\xFA\x8E\x86\xA1\x6F\xE6\x45\xE6\x13\x0E\xB3\xE5\x61\x04\x77\x4F"
                              "\xBD\xE1\x82\xE8\xEA\x1C\x2E\xAB\x38\xEA\xA6\x6C\xAB\xFB\xB3\xAB\xCC\x26\x1D\x1F"
@@ -33,8 +33,9 @@ const char HTTP_HEAD_LAST_SCRIPT32_COMPRESSED[] PROGMEM = "\x30\x2F\x83\xAD\xCE\
                              "\xA6\x7C\x3E\x1C\xC3\xF4\x7E\x88\xD8\x74\xF5\x5D\x0B\xF1\xF0\xF8\x72\x9B\x20\x42"
                              "\xE3\x2A\x01\xF8\x6C\x3A\x7D\xF8\x66\x77\x99\x53\x36\x51\xE3\x4C\x1D\xDF\x1F\x0F"
                              "\x87\xD9\x8B\x0B\xCC\xFB\x3B\xDE\x74\x55\xA3\x5E\x0B\xA3\xBA\x77\x4E\xF1\xF0\xFC"
-                             "\x04\x4E\x19\x4E\xA3\x9C\xDB\x3B\xC4\x08\x78\x4D\x7C\x5B\x3E\xCE\xF7\x85\x82\x27"
-                             "\x10\x08\x16\x75\xA3\x8C\xEF\x1E\xD2\x05\x4C\xD4\xE5\x36\xC8\x10\x78\xB0\x36\x1D"
-                             "\x3C\xF8\x43\xBA\x77\x8F\x07\xB8\xF4\x3B\x3C\x1F\xF4\x65\x1F\x86";
+                             "\x04\x4E\x19\x4E\xA3\x9C\xDB\x3B\xC4\x08\x78\x4D\x7C\x58\x27\x61\x1E\x16\x08\x38"
+                             "\x39\xC8\xDB\x20\x42\xE2\x61\x02\xCE\xE4\x71\x9D\xE3\xDA\x40\xA9\xA6\x9C\xA2\x04"
+                             "\x1C\x88\xF0\x7B\x8F\x06\xC3\xA7\x9F\x08\x77\x4E\xF1\xE0\xF7\x1E\x87\x67\x83\xFE"
+                             "\x8C\xA3\xF0";
 
 #define  HTTP_HEAD_LAST_SCRIPT32       Decompress(HTTP_HEAD_LAST_SCRIPT32_COMPRESSED,HTTP_HEAD_LAST_SCRIPT32_SIZE).c_str()
\ No newline at end of file
diff --git a/tasmota/html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h b/tasmota/html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h
index 3b8a1ebffbbd..9cfbb570bef9 100644
--- a/tasmota/html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h
+++ b/tasmota/html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h
@@ -54,7 +54,7 @@ const char HTTP_HEAD_LAST_SCRIPT32[] PROGMEM =
         "var s=x.responseText;"
         // "console.log('responseText:'+s);"
         "if(s=='false')setTimeout(()=>{fct(t);},6000);"
-        "if(s=='true')su(t);"
+        "if(s=='true')setTimeout(()=>{su(t);},1000);"
       "}else if(x.readyState==4&&x.status==0){"
         "setTimeout(()=>{fct(t);},2000);"             // retry in 2 seconds
       "};"