From 4ecfc9fc115221ec66769915bf02ac37c40ffcd5 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sun, 5 Apr 2020 09:56:59 +0100 Subject: 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. --- configs/mingw32_defconfig | 13 +++++++------ configs/mingw64_defconfig | 13 +++++++------ libbb/Kbuild.src | 2 +- 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 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.0.git -# Fri Feb 14 09:52:00 2020 +# Sun Apr 5 09:22:18 2020 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -869,18 +869,18 @@ CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y # CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set # 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_ERROR_PAGES is not set +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y # CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_FEATURE_HTTPD_GZIP=y # CONFIG_IFCONFIG is not set # CONFIG_FEATURE_IFCONFIG_STATUS is not set # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -1190,6 +1190,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_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 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.0.git -# Fri Feb 14 09:52:00 2020 +# Sun Apr 5 09:22:18 2020 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -869,18 +869,18 @@ CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y # CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set # 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_ERROR_PAGES is not set +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y # CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_FEATURE_HTTPD_GZIP=y # CONFIG_IFCONFIG is not set # CONFIG_FEATURE_IFCONFIG_STATUS is not set # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -1190,6 +1190,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_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 lib-y += safe_strncpy.o lib-y += safe_write.o lib-y += securetty.o +lib-y += simplify_path.o lib-y += single_argv.o lib-y += skip_whitespace.o lib-y += str_tolower.o @@ -109,7 +110,6 @@ lib-$(CONFIG_PLATFORM_POSIX) += progress.o lib-$(CONFIG_PLATFORM_POSIX) += read_key.o lib-$(CONFIG_PLATFORM_POSIX) += setup_environment.o lib-$(CONFIG_PLATFORM_POSIX) += signals.o -lib-$(CONFIG_PLATFORM_POSIX) += simplify_path.o lib-$(CONFIG_PLATFORM_POSIX) += speed_table.o lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o lib-$(CONFIG_PLATFORM_POSIX) += warn_ignoring_args.o -- cgit v1.2.3-55-g6feb