Merge tag '386.14-beta1' into master-386_x

386.14-beta1
gnuton · Jul 1, 2024 · ff6a1b3 · ff6a1b3
2 parents 4d89e61 + bc81bcc
commit ff6a1b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Changelog-386.txt b/Changelog-386.txt
@@ -2,6 +2,10 @@ Asuswrt-Merlin Changelog
 ========================
 
 386.14 (xx-xxx-xxxx)
+  - NOTE: Reminder that all models on the 386.xx series will
+          stop being supported by Asuswrt-Merlin at the end
+          of 2024.
+
   - UPDATED: Merged with GPL 386_52805.
   - UPDATED: wget to 1.24.5.
 

diff --git a/release/src-rt/version.conf b/release/src-rt/version.conf
@@ -1,7 +1,7 @@
 KERNEL_VER=3.0
 FS_VER=0.4
 SERIALNO=386.14
-EXTENDNO=alpha2
+EXTENDNO=beta1
 ifeq ($(ROG_UI),y)
 EXTENDNO:=$(EXTENDNO)_rog
 endif

diff --git a/release/src/router/httpd/web.c b/release/src/router/httpd/web.c
@@ -30775,6 +30775,7 @@ ej_httpd_cert_info(int eid, webs_t wp, int argc, char **argv)
 	if (le_enable == 1) {
 		/* Let's encrypt */
 		get_path_le_domain_cert(cert_path, sizeof(cert_path));
+		CA_cert_path = NULL;
 	} else if (le_enable == 2) {
 		/* uploaded cert. */
 		if (f_exists(UPLOAD_CACERT) && f_exists(UPLOAD_CAKEY)) {