3 files changed, 17 insertions, 11 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index a86be37ea..d93eefcf5 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0.git
-# Mon Apr  6 08:34:52 2020
+# Tue Apr  7 08:21:17 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -877,7 +877,7 @@ CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 2c60d22ac..3bd6beb70 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0.git
-# Mon Apr  6 08:34:52 2020
+# Tue Apr  7 08:21:17 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -877,7 +877,7 @@ CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
diff --git a/networking/httpd.c b/networking/httpd.c
index 7e1c187a5..9cf85dc21 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -220,7 +220,12 @@
 //kbuild:lib-$(CONFIG_HTTPD) += httpd.o
 
 //usage:#define httpd_trivial_usage
+//usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:       "[-ifv[v]]"
+//usage:        )
+//usage:        IF_PLATFORM_MINGW32(
+//usage:       "[-fv[v]]"
+//usage:        )
 //usage:       " [-c CONFFILE]"
 //usage:       " [-p [IP:]PORT]"
 //usage:        IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]")
@@ -232,9 +237,6 @@
 //usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -i              Inetd mode"
 //usage:        )
-//usage:        IF_PLATFORM_MINGW32(
-//usage:     "\n        -i fd           Inetd mode file descriptor"
-//usage:        )
 //usage:     "\n        -f              Don't daemonize"
 //usage:     "\n        -v[v]           Verbose"
 //usage:     "\n        -p [IP:]PORT    Bind to IP:PORT (default *:80)"
@@ -2670,7 +2672,7 @@ static void mini_httpd_win32(int fg, int sock, int argc, char **argv)
         argv_copy[0] = (char *)bb_busybox_exec_path;
         argv_copy[1] = (char *)"--busybox";
         argv_copy[2] = (char *)"httpd";
-        argv_copy[3] = (char *)"-i";
+        argv_copy[3] = (char *)"-I";
         memcpy(&argv_copy[5], &argv[1], argc * sizeof(argv[0]));
 
         while (1) {
@@ -2801,10 +2803,11 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                         IF_FEATURE_HTTPD_AUTH_MD5("m:")
                         IF_FEATURE_HTTPD_SETUID("u:")
                         IF_NOT_PLATFORM_MINGW32("p:ifv")
-                        IF_PLATFORM_MINGW32("p:i:+fv")
+                        IF_PLATFORM_MINGW32("p:I:+fv")
                         "\0"
                         /* -v counts, -i implies -f */
-                        "vv:if",
+                        IF_NOT_PLATFORM_MINGW32("vv:if",)
+                        IF_PLATFORM_MINGW32("vv:If",)
                         &opt_c_configFile, &url_for_decode, &home_httpd
                         IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
                         IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
@@ -2852,7 +2855,10 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                 mingw_daemonize(argv);
 #endif
 
-        xchdir(home_httpd);
+#if ENABLE_PLATFORM_MINGW32
+        if (!(opt & OPT_INETD))
+#endif
+                xchdir(home_httpd);
         if (!(opt & OPT_INETD)) {
 #ifdef SIGCHLD
                 signal(SIGCHLD, SIG_IGN);