aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-16 16:17:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-16 16:17:02 +0000
commit0871bc89fbedc7d1a34feb7368fb8126956f58e5 (patch)
tree3571a86f1c4b725a3b4e2e1f7f37359e3dcd8b55 /include
parente867b7ce868ecd721a871b686a4a017cd15e2fb2 (diff)
downloadbusybox-0871bc89fbedc7d1a34feb7368fb8126956f58e5.tar.gz
httpd: add -i (inetd) and -f (foreground) otions.
-i makes possible to run httpd in both inetd and standalone mode without recompile (or need to have two different binaries)
Diffstat (limited to 'include')
-rw-r--r--include/usage.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/usage.h b/include/usage.h
index db41a8e79..ef3fb63d3 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1184,7 +1184,8 @@ USE_FEATURE_DATE_ISOFMT( \
#define httpd_trivial_usage \
"[-c <conf file>]" \
- USE_FEATURE_HTTPD_WITHOUT_INETD(" [-p <port>]") \
+ " [-p <port>]" \
+ " [-i] [-f]" \
USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \
USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \
USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
@@ -1194,7 +1195,9 @@ USE_FEATURE_DATE_ISOFMT( \
"Listens for incoming http server requests.\n\n" \
"Options:\n" \
"\t-c FILE\t\tSpecifies configuration file. (default httpd.conf)\n" \
- USE_FEATURE_HTTPD_WITHOUT_INETD("\t-p PORT\t\tServer port (default 80)\n") \
+ "\t-p PORT\t\tServer port (default 80)\n" \
+ "\t-i\t\tAssume that we are started frim inetd\n" \
+ "\t-f\t\tDo not daemonize\n" \
USE_FEATURE_HTTPD_SETUID("\t-u USER[:GRP]\tSet uid/gid after binding to port\n") \
USE_FEATURE_HTTPD_BASIC_AUTH("\t-r REALM\tAuthentication Realm for Basic Authentication\n") \
USE_FEATURE_HTTPD_AUTH_MD5("\t-m PASS\t\tCrypt PASS with md5 algorithm\n") \