Merge branch 'busybox' into mergeFRP-3466-g53c09d0e1

1 files changed, 6 insertions, 0 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index efe57ecf7..eeaa4bec1 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2878,10 +2878,16 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                 mingw_daemonize(argv);
 #endif
 
+        /* Chdir to home (unless we were re-execed for NOMMU case:
+         * we are already in the home dir then).
+         */
 #if ENABLE_PLATFORM_MINGW32
         if (!(opt & OPT_INETD))
+#else
+        if (!re_execed)
 #endif
                 xchdir(home_httpd);
+
         if (!(opt & OPT_INETD)) {
 #ifdef SIGCHLD
                 signal(SIGCHLD, SIG_IGN);