aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2020-04-05 09:56:59 +0100
committerRon Yorston <rmy@pobox.com>2020-04-05 10:05:06 +0100
commit4ecfc9fc115221ec66769915bf02ac37c40ffcd5 (patch)
treeed9dfd2ea6bb0f2e5d98b3a511d1b3c6f9f7185b
parentfbfb02e8637409f1367cb0d8a3d02f6366261ab4 (diff)
downloadbusybox-w32-4ecfc9fc115221ec66769915bf02ac37c40ffcd5.tar.gz
busybox-w32-4ecfc9fc115221ec66769915bf02ac37c40ffcd5.tar.bz2
busybox-w32-4ecfc9fc115221ec66769915bf02ac37c40ffcd5.zip
httpd: enable in default configurations
Enable the httpd applet in WIN32 default configurations. Some additional features have also been enabled: 'Ranges:' header Basic HTTP authentication Custom error pages GZIP content encoding Common Gateway Interface (CGI) and related features are not enabled. Basic HTTP authentication requires bb_simplify_abs_path_inplace(). This function shouldn't be used for WIN32 paths. In this case it's processing a URL which is OK.
Diffstat
-rw-r--r--configs/mingw32_defconfig13
-rw-r--r--configs/mingw64_defconfig13
-rw-r--r--libbb/Kbuild.src2
3 files changed, 15 insertions, 13 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 28535c945..5616851f6 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.32.0.git 3# Busybox version: 1.32.0.git
4# Fri Feb 14 09:52:00 2020 4# Sun Apr 5 09:22:18 2020
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -869,18 +869,18 @@ CONFIG_FTPPUT=y
869CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y 869CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
870# CONFIG_HOSTNAME is not set 870# CONFIG_HOSTNAME is not set
871# CONFIG_DNSDOMAINNAME is not set 871# CONFIG_DNSDOMAINNAME is not set
872# CONFIG_HTTPD is not set 872CONFIG_HTTPD=y
873# CONFIG_FEATURE_HTTPD_RANGES is not set 873CONFIG_FEATURE_HTTPD_RANGES=y
874# CONFIG_FEATURE_HTTPD_SETUID is not set 874# CONFIG_FEATURE_HTTPD_SETUID is not set
875# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set 875CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
876# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set 876# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
877# CONFIG_FEATURE_HTTPD_CGI is not set 877# CONFIG_FEATURE_HTTPD_CGI is not set
878# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set 878# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
879# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 879# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
880# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 880# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
881# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set 881CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
882# CONFIG_FEATURE_HTTPD_PROXY is not set 882# CONFIG_FEATURE_HTTPD_PROXY is not set
883# CONFIG_FEATURE_HTTPD_GZIP is not set 883CONFIG_FEATURE_HTTPD_GZIP=y
884# CONFIG_IFCONFIG is not set 884# CONFIG_IFCONFIG is not set
885# CONFIG_FEATURE_IFCONFIG_STATUS is not set 885# CONFIG_FEATURE_IFCONFIG_STATUS is not set
886# CONFIG_FEATURE_IFCONFIG_SLIP is not set 886# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -1190,6 +1190,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
1190# CONFIG_FEATURE_REMOTE_LOG is not set 1190# CONFIG_FEATURE_REMOTE_LOG is not set
1191# CONFIG_FEATURE_SYSLOGD_DUP is not set 1191# CONFIG_FEATURE_SYSLOGD_DUP is not set
1192# CONFIG_FEATURE_SYSLOGD_CFG is not set 1192# CONFIG_FEATURE_SYSLOGD_CFG is not set
1193# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
1193CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 1194CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1194# CONFIG_FEATURE_IPC_SYSLOG is not set 1195# CONFIG_FEATURE_IPC_SYSLOG is not set
1195CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 1196CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 3fb8f095b..92daa7839 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.32.0.git 3# Busybox version: 1.32.0.git
4# Fri Feb 14 09:52:00 2020 4# Sun Apr 5 09:22:18 2020
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -869,18 +869,18 @@ CONFIG_FTPPUT=y
869CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y 869CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
870# CONFIG_HOSTNAME is not set 870# CONFIG_HOSTNAME is not set
871# CONFIG_DNSDOMAINNAME is not set 871# CONFIG_DNSDOMAINNAME is not set
872# CONFIG_HTTPD is not set 872CONFIG_HTTPD=y
873# CONFIG_FEATURE_HTTPD_RANGES is not set 873CONFIG_FEATURE_HTTPD_RANGES=y
874# CONFIG_FEATURE_HTTPD_SETUID is not set 874# CONFIG_FEATURE_HTTPD_SETUID is not set
875# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set 875CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
876# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set 876# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
877# CONFIG_FEATURE_HTTPD_CGI is not set 877# CONFIG_FEATURE_HTTPD_CGI is not set
878# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set 878# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
879# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 879# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
880# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 880# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
881# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set 881CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
882# CONFIG_FEATURE_HTTPD_PROXY is not set 882# CONFIG_FEATURE_HTTPD_PROXY is not set
883# CONFIG_FEATURE_HTTPD_GZIP is not set 883CONFIG_FEATURE_HTTPD_GZIP=y
884# CONFIG_IFCONFIG is not set 884# CONFIG_IFCONFIG is not set
885# CONFIG_FEATURE_IFCONFIG_STATUS is not set 885# CONFIG_FEATURE_IFCONFIG_STATUS is not set
886# CONFIG_FEATURE_IFCONFIG_SLIP is not set 886# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -1190,6 +1190,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
1190# CONFIG_FEATURE_REMOTE_LOG is not set 1190# CONFIG_FEATURE_REMOTE_LOG is not set
1191# CONFIG_FEATURE_SYSLOGD_DUP is not set 1191# CONFIG_FEATURE_SYSLOGD_DUP is not set
1192# CONFIG_FEATURE_SYSLOGD_CFG is not set 1192# CONFIG_FEATURE_SYSLOGD_CFG is not set
1193# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
1193CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 1194CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1194# CONFIG_FEATURE_IPC_SYSLOG is not set 1195# CONFIG_FEATURE_IPC_SYSLOG is not set
1195CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 1196CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 799f6d01a..dab1e6dae 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -66,6 +66,7 @@ lib-y += safe_poll.o
66lib-y += safe_strncpy.o 66lib-y += safe_strncpy.o
67lib-y += safe_write.o 67lib-y += safe_write.o
68lib-y += securetty.o 68lib-y += securetty.o
69lib-y += simplify_path.o
69lib-y += single_argv.o 70lib-y += single_argv.o
70lib-y += skip_whitespace.o 71lib-y += skip_whitespace.o
71lib-y += str_tolower.o 72lib-y += str_tolower.o
@@ -109,7 +110,6 @@ lib-$(CONFIG_PLATFORM_POSIX) += progress.o
109lib-$(CONFIG_PLATFORM_POSIX) += read_key.o 110lib-$(CONFIG_PLATFORM_POSIX) += read_key.o
110lib-$(CONFIG_PLATFORM_POSIX) += setup_environment.o 111lib-$(CONFIG_PLATFORM_POSIX) += setup_environment.o
111lib-$(CONFIG_PLATFORM_POSIX) += signals.o 112lib-$(CONFIG_PLATFORM_POSIX) += signals.o
112lib-$(CONFIG_PLATFORM_POSIX) += simplify_path.o
113lib-$(CONFIG_PLATFORM_POSIX) += speed_table.o 113lib-$(CONFIG_PLATFORM_POSIX) += speed_table.o
114lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o 114lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o
115lib-$(CONFIG_PLATFORM_POSIX) += warn_ignoring_args.o 115lib-$(CONFIG_PLATFORM_POSIX) += warn_ignoring_args.o
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 20:23:19 +0000