5 files changed, 38 insertions, 18 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index c5e108a30..94281b942 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sat Jan 20 09:32:45 2024
+# Sun Feb 11 11:01:45 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -919,7 +919,7 @@ CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
 CONFIG_FEATURE_HTTPD_CGI=y
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 341da22d6..ac8bfee26 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sat Jan 20 09:32:45 2024
+# Sun Feb 11 11:01:45 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -919,7 +919,7 @@ CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
 CONFIG_FEATURE_HTTPD_CGI=y
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
diff --git a/configs/mingw64a_defconfig b/configs/mingw64a_defconfig
index 8eb8bbcfa..5cc75334d 100644
--- a/configs/mingw64a_defconfig
+++ b/configs/mingw64a_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sat Jan 20 09:32:45 2024
+# Sun Feb 11 11:01:45 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -919,7 +919,7 @@ CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
 CONFIG_FEATURE_HTTPD_CGI=y
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
diff --git a/configs/mingw64u_defconfig b/configs/mingw64u_defconfig
index 4218c57a5..301d68c82 100644
--- a/configs/mingw64u_defconfig
+++ b/configs/mingw64u_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Sat Jan 20 09:32:45 2024
+# Sun Feb 11 11:01:45 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -919,7 +919,7 @@ CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
 CONFIG_FEATURE_HTTPD_CGI=y
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
diff --git a/networking/httpd.c b/networking/httpd.c
index 26656fd16..c76ce3658 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1580,7 +1580,6 @@ static void cgi_handler(char **argv)
 {
         struct fd_pair fromCgi;  /* CGI -> httpd pipe */
         struct fd_pair toCgi;    /* httpd -> CGI pipe */
-        char *dir, *script;
 
         xfunc_error_retval = 242;
 
@@ -1595,16 +1594,12 @@ static void cgi_handler(char **argv)
         xmove_fd(toCgi.rd, 0);  /* replace stdin with the pipe */
         xmove_fd(fromCgi.wr, 1);  /* replace stdout with the pipe */
 
-        dir = argv[1];
-        script = argv[2];
-
-        if (chdir_or_warn(dir) != 0) {
+        if (argv[1][0] && chdir_or_warn(argv[1]) != 0) {
                 goto error_execing_cgi;
         }
 
         /* set argv[0] to name without path */
-        argv[0] = script;
-        argv[1] = NULL;
+        argv += 2;
 
         /* _NOT_ execvp. We do not search PATH. argv[0] is a filename
          * without any dir components and will only match a file
@@ -1655,6 +1650,7 @@ static void send_cgi_and_exit(
         char *script, *last_slash;
         int pid;
 #if ENABLE_PLATFORM_MINGW32
+        const char *script_dir;
         char **argv;
 #endif
 
@@ -1693,7 +1689,11 @@ static void send_cgi_and_exit(
                 *script = '\0';         /* cut off /PATH_INFO */
 
         /* SCRIPT_FILENAME is required by PHP in CGI mode */
+#if ENABLE_PLATFORM_MINGW32
+        if (!is_relative_path(home_httpd)) {
+#else
         if (home_httpd[0] == '/') {
+#endif
                 char *fullpath = concat_path_file(home_httpd, url);
                 setenv1("SCRIPT_FILENAME", fullpath);
         }
@@ -1745,13 +1745,15 @@ static void send_cgi_and_exit(
 
 #if ENABLE_PLATFORM_MINGW32
         /* Find script's dir */
+        script_dir = "";
         script = last_slash;
         if (script != url) { /* paranoia */
                 *script = '\0';
+                script_dir = url + 1;
         }
         script++;
 
-        argv = xzalloc((server_argc + 8) * sizeof(char *));
+        argv = xzalloc((server_argc + 9) * sizeof(char *));
         argv[0] = (char *)bb_busybox_exec_path;
         argv[1] = (char *)"--busybox";
         argv[2] = (char *)"-httpd";             // don't daemonise in main()
@@ -1759,9 +1761,27 @@ static void send_cgi_and_exit(
         memcpy(argv + 4, server_argv, sizeof(*argv) * server_argc);
         argv[server_argc + 4] = xasprintf("%d:%d:%d:%d", toCgi.wr, toCgi.rd,
                                                 fromCgi.wr, fromCgi.rd);
-        argv[server_argc + 5] = (char *)url + 1;        // script directory
+        argv[server_argc + 5] = (char *)script_dir;     // script directory
         argv[server_argc + 6] = (char *)script; // script name
-        /* argv[server_argc + 7] = NULL; - xzalloc did it */
+
+#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+        {
+                char *suffix = strrchr(script, '.');
+
+                if (suffix) {
+                        Htaccess *cur;
+                        for (cur = script_i; cur; cur = cur->next) {
+                                if (strcmp(cur->before_colon + 1, suffix) == 0) {
+                                        /* found interpreter name */
+                                        argv[server_argc + 6] = (char *)cur->after_colon;
+                                        argv[server_argc + 7] = (char *)script;
+                                        break;
+                                }
+                        }
+                }
+        }
+#endif
+        /* argv[server_argc + N] = NULL; - xzalloc did it */
 
         pid = foreground ? mingw_spawn(argv) : mingw_spawn_detach(argv);
         if (pid == -1)