From patchwork Tue Mar 31 08:31:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhabu Bindu X-Patchwork-Id: 84880 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F33C8FF60ED for ; Tue, 31 Mar 2026 08:33:14 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.15248.1774945987306183354 for ; Tue, 31 Mar 2026 01:33:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=hjQt0551; spf=pass (domain: gmail.com, ip: 209.85.215.171, mailfrom: bindudaniel1996@gmail.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c76b6abdb73so148768a12.1 for ; Tue, 31 Mar 2026 01:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774945986; x=1775550786; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=jACZPSH2k4xxRoQqO1XmXMjTiMOH9nGdB+ZCM8aDCbA=; b=hjQt0551sXLA+uly969DMWze8cLRZ6PanZrif0C5GF5p+szuWsN+3qC6nHzE+jU8q3 D3YCzy84gnxl2uS5u06Sx0LNgQajFuJ/r53nUdVfHPgFWLZcHAKPm5I+mFjHg8VnoqRS /xqRoMcfgiBhQJurHTnGQiBsy1TIcXbHga1R6L2KZ+0FufIvWaRSPLRTaC26MjulyReB YfV21/rbMGXUMjbG5dXl4cc8vvOo3n+NmkmXcVsFjc0Ul/OmuXCNgoNArwaAnvSjsU5e +cJ/915ZT+hV3I+7LSLYH6DvRgZ69dpiHt5hEaHsmT6pKq+69u93WvQ3tA2l39+GMWuf Kj5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774945986; x=1775550786; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jACZPSH2k4xxRoQqO1XmXMjTiMOH9nGdB+ZCM8aDCbA=; b=sSOzbSZXuDs+k5vLnFU6+vHM2AoOOU9ZtTS6BRykfmnILPMCHR4LtnF7BfPJuco8H2 0DKl4xVtrPpsh69Ae4QX4Yn7xQMVFzjkvoCtCRCIB5WfQKlVC6Os6F5X/OWCvkUtst4O 1mm4A1UUPr1t8QldUCkb0KL2m5fV6e+FBF650jubuO1Q6nIz7fYcztDeC+13ygS0di9u mEFx9gXitAEm75LTppia6gxe4eGT44piFoy+yGKepBwtqdnbs38snGeEowpYLah22BAi 7I80WZm91zjRVzTpOgm3B5dmdmBm+NnJ0Qe9BeHVOnrZW6/wXDKk+pZdX60vJpPMVWPq KYVw== X-Gm-Message-State: AOJu0YwXqu+7NNRnaD4DvDOoKQfxZ4a7trvtDSMjvjerlCRQa413Im4R DUdD5HvYWtGOiDMnsnja8ekX8Q6DGKYKbeTnJ1XpnlIbf78x2S4FcsM/q3YyDg== X-Gm-Gg: ATEYQzwkGJk5k76+FS4VKbVyvWIjkMO8CC/bHgrfQi17SsLMUCRlHFqFdWTOOlyVaZz dIGPH3VWV58Kpzoz48WRpZlvMxawwwnIhg8YmYxrxSRe4wDa95/AxgZSXkKmReVGor/H+WCkU2I cX9BtftMl4uvMZGamOTpnOHhfYKRtLaPTvVX2WU5Qg4NbcNRlp095Yzx/7cUsFNjpPkRgWfw/R6 LQJL6CxGsii4x+XFhKwTdH5bi4qGzGvutK4EX35R2JyznrunEU3JRRsxQmkV9hNSxNZ2e02WWyv T42Z62KPLrcbj3KrwAOPKiMBeGzVvFdudr4hyQp+BFu61JCHF6Ih7jM8CiKsuGn1xqvVX38NJmx zOS3O01VI0VebOICuRFdgZEIwgM6LmM9WJ6mb5oExtZiWsWHKgSEV3if63LGord6o72KA3/WlU6 e18ORhByT/DSXCThfSPKd/2gm8ZXcq3Q== X-Received: by 2002:a05:6a20:2589:b0:39b:8545:f24 with SMTP id adf61e73a8af0-39c87c12229mr18303363637.51.1774945985861; Tue, 31 Mar 2026 01:33:05 -0700 (PDT) Received: from L-12443L.kpit.com ([106.51.46.154]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cdaa4c3basm1453641b3a.37.2026.03.31.01.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 01:33:05 -0700 (PDT) From: Bhabu Bindu X-Google-Original-From: Bhabu Bindu To: openembedded-devel@lists.openembedded.org, bhabu.bindu@kpit.com Subject: [meta-oe][kirkstone][PATCH] neon: Backport redirect test debug improvements Date: Tue, 31 Mar 2026 14:01:33 +0530 Message-Id: <20260331083134.378318-1-bhabu.bindu@kpit.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 08:33:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125878 The redirect test in neon 0.30.2 intermittently fails with "did not get NE_REDIRECT", making it hard to debug. Backport relevant upstream changes from updated neon version to: - log actual return value when NE_REDIRECT is not received - use double_serve_sstring for improved test reliability Upstream-Status: Backport [https://github.com/notroj/neon/commit/f7a3d8f1366c7df6578d79af3b5d28a316011be0] [https://github.com/notroj/neon/commit/0f8dec6c8e7d672f74bb5f81fc7c6bd0d5c56619] [https://github.com/notroj/neon/commit/1e562888d85efc492c434474c8d90cef3aaa8b18] [https://github.com/notroj/neon/commit/9e836bb63bf41fd78e12175cd7b35bfb07a031e3] Signed-off-by: Bhabu Bindu --- ...0001-Temporarily-disable-no_redirect.patch | 45 +++++++++++++++++ ...ling-no_redirect-with-more-debugging.patch | 50 +++++++++++++++++++ ...Switch-to-using-double_serve_sstring.patch | 48 ++++++++++++++++++ .../neon/0004-test-redirect.c-Cleanup.patch | 49 ++++++++++++++++++ meta-oe/recipes-support/neon/neon_0.30.2.bb | 4 ++ 5 files changed, 196 insertions(+) create mode 100644 meta-oe/recipes-support/neon/neon/0001-Temporarily-disable-no_redirect.patch create mode 100644 meta-oe/recipes-support/neon/neon/0002-Re-enabling-no_redirect-with-more-debugging.patch create mode 100644 meta-oe/recipes-support/neon/neon/0003-no_redirect-Switch-to-using-double_serve_sstring.patch create mode 100644 meta-oe/recipes-support/neon/neon/0004-test-redirect.c-Cleanup.patch diff --git a/meta-oe/recipes-support/neon/neon/0001-Temporarily-disable-no_redirect.patch b/meta-oe/recipes-support/neon/neon/0001-Temporarily-disable-no_redirect.patch new file mode 100644 index 0000000000..891457fab2 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0001-Temporarily-disable-no_redirect.patch @@ -0,0 +1,45 @@ +From f7a3d8f1366c7df6578d79af3b5d28a316011be0 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Thu, 7 Mar 2019 09:56:57 +0000 +Subject: [PATCH 1/5] Temporarily disable redirect.c:no_redirect + +Upstream-Status: Backport +[https://github.com/notroj/neon/commit/f7a3d8f1366c7df6578d79af3b5d28a316011be0] +Signed-off-by: Bindu Bhabu +--- + test/redirect.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/redirect.c b/test/redirect.c +index c93b388..920c481 100644 +--- a/test/redirect.c ++++ b/test/redirect.c +@@ -162,6 +162,7 @@ static int fail_loop(void) + } + #endif + ++#if 0 + /* ensure that ne_redirect_location returns NULL when no redirect has + * been encountered, or redirect hooks aren't registered. */ + static int no_redirect(void) +@@ -187,6 +188,7 @@ static int no_redirect(void) + ne_session_destroy(sess); + return OK; + } ++#endif + + ne_test tests[] = { + T(lookup_localhost), +@@ -194,7 +196,9 @@ ne_test tests[] = { + T(non_absolute), + T(relative_1), + T(relative_2), ++#if 0 + T(no_redirect), ++#endif + T(NULL) + }; + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/neon/neon/0002-Re-enabling-no_redirect-with-more-debugging.patch b/meta-oe/recipes-support/neon/neon/0002-Re-enabling-no_redirect-with-more-debugging.patch new file mode 100644 index 0000000000..a6b524b52c --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0002-Re-enabling-no_redirect-with-more-debugging.patch @@ -0,0 +1,50 @@ +From 0f8dec6c8e7d672f74bb5f81fc7c6bd0d5c56619 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Mon, 8 Apr 2019 10:22:52 +0100 +Subject: [PATCH 2/5] * test/redirect: Try re-enabling no_redirect with more + debugging. + +Upstream-Status: Backport +[https://github.com/notroj/neon/commit/0f8dec6c8e7d672f74bb5f81fc7c6bd0d5c56619] +Signed-off-by: Bindu Bhabu +--- + test/redirect.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/test/redirect.c b/test/redirect.c +index 920c481..e7ecc19 100644 +--- a/test/redirect.c ++++ b/test/redirect.c +@@ -64,7 +64,10 @@ static int serve_redir(ne_socket *sock, void *ud) + static int process_redir(ne_session *sess, const char *path, + const ne_uri **redir) + { +- ONN("did not get NE_REDIRECT", any_request(sess, path) != NE_REDIRECT); ++ int ret = any_request(sess, path); ++ ONV(ret != NE_REDIRECT, ++ ("request got %d (%s) rather than NE_REDIRECT", ++ ret, ne_get_error(sess))); + *redir = ne_redirect_location(sess); + return OK; + } +@@ -162,7 +165,7 @@ static int fail_loop(void) + } + #endif + +-#if 0 ++#if 01 + /* ensure that ne_redirect_location returns NULL when no redirect has + * been encountered, or redirect hooks aren't registered. */ + static int no_redirect(void) +@@ -196,7 +199,7 @@ ne_test tests[] = { + T(non_absolute), + T(relative_1), + T(relative_2), +-#if 0 ++#if 1 + T(no_redirect), + #endif + T(NULL) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/neon/neon/0003-no_redirect-Switch-to-using-double_serve_sstring.patch b/meta-oe/recipes-support/neon/neon/0003-no_redirect-Switch-to-using-double_serve_sstring.patch new file mode 100644 index 0000000000..c8278cc701 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0003-no_redirect-Switch-to-using-double_serve_sstring.patch @@ -0,0 +1,48 @@ +From 1e562888d85efc492c434474c8d90cef3aaa8b18 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Mon, 8 Apr 2019 10:32:27 +0100 +Subject: [PATCH 3/5] * test/redirect.c (no_redirect): Switch to using + double_serve_sstring. + +Upstream-Status: Backport +[https://github.com/notroj/neon/commit/1e562888d85efc492c434474c8d90cef3aaa8b18] +Signed-off-by: Bindu Bhabu +--- + test/redirect.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/test/redirect.c b/test/redirect.c +index e7ecc19..42deadb 100644 +--- a/test/redirect.c ++++ b/test/redirect.c +@@ -166,17 +166,23 @@ static int fail_loop(void) + #endif + + #if 01 ++ ++#define RESP1 "HTTP/1.1 200 OK\r\n" "Content-Length: 0\r\n\r\n" ++#define RESP2 "HTTP/1.0 302 Get Ye Away\r\n" "Location: /blah\r\n" "\r\n" + /* ensure that ne_redirect_location returns NULL when no redirect has + * been encountered, or redirect hooks aren't registered. */ + static int no_redirect(void) + { + ne_session *sess; + const ne_uri *loc; ++ struct double_serve_args resp; ++ ++ resp.first.data = RESP1; ++ resp.first.len = strlen(RESP1); ++ resp.second.data = RESP2; ++ resp.second.len = strlen(RESP2); + +- CALL(session_server(&sess, single_serve_string, +- "HTTP/1.1 200 OK\r\n" "Content-Length: 0\r\n\r\n" +- "HTTP/1.0 302 Get Ye Away\r\n" +- "Location: /blah\r\n" "\r\n")); ++ CALL(session_server(&sess, double_serve_sstring, &resp)); + ONN("redirect non-NULL before register", ne_redirect_location(sess)); + ne_redirect_register(sess); + ONN("initial redirect non-NULL", ne_redirect_location(sess)); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/neon/neon/0004-test-redirect.c-Cleanup.patch b/meta-oe/recipes-support/neon/neon/0004-test-redirect.c-Cleanup.patch new file mode 100644 index 0000000000..e92864bc19 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0004-test-redirect.c-Cleanup.patch @@ -0,0 +1,49 @@ +From 9e836bb63bf41fd78e12175cd7b35bfb07a031e3 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Mon, 8 Apr 2019 10:35:42 +0100 +Subject: [PATCH 4/5] * test/redirect.c: Cleanup. + +Upstream-Status: Backport +[https://github.com/notroj/neon/commit/9e836bb63bf41fd78e12175cd7b35bfb07a031e3] +Signed-off-by: Bindu Bhabu +--- + test/redirect.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/test/redirect.c b/test/redirect.c +index 42deadb..682097d 100644 +--- a/test/redirect.c ++++ b/test/redirect.c +@@ -165,10 +165,9 @@ static int fail_loop(void) + } + #endif + +-#if 01 +- + #define RESP1 "HTTP/1.1 200 OK\r\n" "Content-Length: 0\r\n\r\n" + #define RESP2 "HTTP/1.0 302 Get Ye Away\r\n" "Location: /blah\r\n" "\r\n" ++ + /* ensure that ne_redirect_location returns NULL when no redirect has + * been encountered, or redirect hooks aren't registered. */ + static int no_redirect(void) +@@ -197,7 +196,6 @@ static int no_redirect(void) + ne_session_destroy(sess); + return OK; + } +-#endif + + ne_test tests[] = { + T(lookup_localhost), +@@ -205,9 +203,7 @@ ne_test tests[] = { + T(non_absolute), + T(relative_1), + T(relative_2), +-#if 1 + T(no_redirect), +-#endif + T(NULL) + }; + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-oe/recipes-support/neon/neon_0.30.2.bb index 646a9eca13..f620d547a9 100644 --- a/meta-oe/recipes-support/neon/neon_0.30.2.bb +++ b/meta-oe/recipes-support/neon/neon_0.30.2.bb @@ -9,6 +9,10 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ file://pkgconfig.patch \ file://fix-package-check-for-libxml2.patch \ file://run-ptest \ + file://0001-Temporarily-disable-no_redirect.patch \ + file://0002-Re-enabling-no_redirect-with-more-debugging.patch \ + file://0003-no_redirect-Switch-to-using-double_serve_sstring.patch \ + file://0004-test-redirect.c-Cleanup.patch \ " SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"