From ce87321c39e829dce5436cac6dc58271e5b4eb31 Mon Sep 17 00:00:00 2001
From: mkadinti <101405874+mkadinti@users.noreply.github.com>
Date: Fri, 27 Mar 2026 15:11:53 +0530
Subject: [PATCH 1/3] =?UTF-8?q?ES1-3219:[RDKE]=20CodeBig=20CDL=20Failure?=
 =?UTF-8?q?=20=E2=80=93=20Firmware=20Download=20Fails=20with=20HTTP=20000?=
 =?UTF-8?q?=20(ret:-1)=20After=20Fallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rdkv_upgrade.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rdkv_upgrade.c b/src/rdkv_upgrade.c
index 470638c3..ea29b6f9 100755
--- a/src/rdkv_upgrade.c
+++ b/src/rdkv_upgrade.c
@@ -658,8 +658,10 @@ int codebigdownloadFile( int server_type, const char* artifactLocationUrl, const
         } else {
             setDwnlState(RDKV_FWDNLD_DOWNLOAD_INIT);
         }
-        // Use the passed curl handle instead of creating a new one
-        if (curl != NULL && *curl != NULL) {
+		if (curl != NULL) {
+			*curl = doCurlInit();
+		}
+		if (curl != NULL && *curl != NULL) {
             if (server_type == HTTP_XCONF_CODEBIG) {
                 setDwnlState(RDKV_XCONF_FWDNLD_DOWNLOAD_INPROGRESS);
             } else {
@@ -674,6 +676,7 @@ int codebigdownloadFile( int server_type, const char* artifactLocationUrl, const
             doStopDownload(*curl);
             // Don't set curl = NULL here - preserve the handle for reuse
             /* Stop the donwload if Throttle speed rfc is set to zero */
+			*curl = NULL;
             if (*force_exit == 1 && (curl_ret_code == 23)) {
                 uninitialize(INITIAL_VALIDATION_SUCCESS);
                 exit(1);

From d6651170b944f71e908aa6851e157da4a3a76650 Mon Sep 17 00:00:00 2001
From: mkadinti <101405874+mkadinti@users.noreply.github.com>
Date: Fri, 27 Mar 2026 15:17:06 +0530
Subject: [PATCH 2/3] Update rdkv_upgrade.c

---
 src/rdkv_upgrade.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/rdkv_upgrade.c b/src/rdkv_upgrade.c
index ea29b6f9..c3907536 100755
--- a/src/rdkv_upgrade.c
+++ b/src/rdkv_upgrade.c
@@ -674,9 +674,7 @@ int codebigdownloadFile( int server_type, const char* artifactLocationUrl, const
                 setDwnlState(RDKV_FWDNLD_DOWNLOAD_EXIT);
             }
             doStopDownload(*curl);
-            // Don't set curl = NULL here - preserve the handle for reuse
-            /* Stop the donwload if Throttle speed rfc is set to zero */
-			*curl = NULL;
+            *curl = NULL;
             if (*force_exit == 1 && (curl_ret_code == 23)) {
                 uninitialize(INITIAL_VALIDATION_SUCCESS);
                 exit(1);

From 4f6bfdfce2f3cc678c2537e8e54b28899d450e1f Mon Sep 17 00:00:00 2001
From: mkadinti <madhunarasimhulu@gmail.com>
Date: Fri, 27 Mar 2026 10:28:37 +0000
Subject: [PATCH 3/3] =?UTF-8?q?ES1-3219:[RDKE]=20CodeBig=20CDL=20Failure?=
 =?UTF-8?q?=20=E2=80=93=20Firmware=20Download=20Fails=20with=20HTTP=20000?=
 =?UTF-8?q?=20(ret:-1)=20After=20Fallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile.am | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 845b1457..a965bdcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,6 +137,11 @@ librdksw_jsonparse_includedir = ${includedir}
 librdksw_flash_includedir = ${includedir}
 librdksw_fwutils_includedir = ${includedir}
 
+# Shared/common headers not tied to specific libraries
+include_HEADERS = \
+    ${top_srcdir}/src/rbusInterface/rbusInterface.h \
+    ${top_srcdir}/src/include/device_status_helper.h
+
 bin_PROGRAMS= rdkvfwupgrader
 
 
@@ -150,18 +155,9 @@ rdkvfwupgrader_SOURCES = \
 rdkvfwupgrader_LDADD = librdksw_jsonparse.la librdksw_upgrade.la librdksw_rfcIntf.la librdksw_iarmIntf.la librdksw_flash.la librdksw_fwutils.la $(cjson_LIBS) $(curl_LIBS) -lrdkloggers -ldwnlutil -lfwutils -lsecure_wrapper -lparsejson -lpthread -lrbus
 rdkvfwupgrader_LDFLAGS = -L$(PKG_CONFIG_SYSROOT_DIR)/$(libdir)
 
-rdkvfwupgrader_include_HEADERS = \
-    ${top_srcdir}/src/rbusInterface/rbusInterface.h \
-    ${top_srcdir}/src/include/rfcinterface.h \
-    ${top_srcdir}/src/include/iarmInterface.h \
-    ${top_srcdir}/src/include/device_status_helper.h
-
 rdkvfwupgrader_CFLAGS = -I${top_srcdir}/src/include -I${top_srcdir}/src/deviceutils
 rdkvfwupgrader_CPPFLAGS = -I${top_srcdir}/src/include -I${top_srcdir}/src/deviceutils
 
-
-rdkvfwupgrader_includedir = ${includedir}
-
 if INSTALL_TEST_FWUPGRADER
 bin_PROGRAMS += testrdkvfwupgrader