Merge busybox into merge

Fix conflicts in reset and ash.

Redefine the new safe_read_key() as a reference to read_key().

Disable SHA256_HWACCEL.

1 files changed, 1 insertions, 2 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 5f7b3a4dd..59b4a769c 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1707,8 +1707,7 @@ static void send_cgi_and_exit(
                 script = last_slash;
                 if (script != url) { /* paranoia */
                         *script = '\0';
-                        if (chdir(url + 1) != 0) {
-                                bb_perror_msg("can't change directory to '%s'", url + 1);
+                        if (chdir_or_warn(url + 1) != 0) {
                                 goto error_execing_cgi;
                         }
                         // not needed: *script = '/';