diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-16 16:17:02 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-16 16:17:02 +0000 |
commit | 0871bc89fbedc7d1a34feb7368fb8126956f58e5 (patch) | |
tree | 3571a86f1c4b725a3b4e2e1f7f37359e3dcd8b55 /include | |
parent | e867b7ce868ecd721a871b686a4a017cd15e2fb2 (diff) | |
download | busybox-w32-0871bc89fbedc7d1a34feb7368fb8126956f58e5.tar.gz busybox-w32-0871bc89fbedc7d1a34feb7368fb8126956f58e5.tar.bz2 busybox-w32-0871bc89fbedc7d1a34feb7368fb8126956f58e5.zip |
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.h | 7 |
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( \ | |||
1184 | 1184 | ||
1185 | #define httpd_trivial_usage \ | 1185 | #define httpd_trivial_usage \ |
1186 | "[-c <conf file>]" \ | 1186 | "[-c <conf file>]" \ |
1187 | USE_FEATURE_HTTPD_WITHOUT_INETD(" [-p <port>]") \ | 1187 | " [-p <port>]" \ |
1188 | " [-i] [-f]" \ | ||
1188 | USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \ | 1189 | USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \ |
1189 | USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \ | 1190 | USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \ |
1190 | USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ | 1191 | USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ |
@@ -1194,7 +1195,9 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
1194 | "Listens for incoming http server requests.\n\n" \ | 1195 | "Listens for incoming http server requests.\n\n" \ |
1195 | "Options:\n" \ | 1196 | "Options:\n" \ |
1196 | "\t-c FILE\t\tSpecifies configuration file. (default httpd.conf)\n" \ | 1197 | "\t-c FILE\t\tSpecifies configuration file. (default httpd.conf)\n" \ |
1197 | USE_FEATURE_HTTPD_WITHOUT_INETD("\t-p PORT\t\tServer port (default 80)\n") \ | 1198 | "\t-p PORT\t\tServer port (default 80)\n" \ |
1199 | "\t-i\t\tAssume that we are started frim inetd\n" \ | ||
1200 | "\t-f\t\tDo not daemonize\n" \ | ||
1198 | USE_FEATURE_HTTPD_SETUID("\t-u USER[:GRP]\tSet uid/gid after binding to port\n") \ | 1201 | USE_FEATURE_HTTPD_SETUID("\t-u USER[:GRP]\tSet uid/gid after binding to port\n") \ |
1199 | USE_FEATURE_HTTPD_BASIC_AUTH("\t-r REALM\tAuthentication Realm for Basic Authentication\n") \ | 1202 | USE_FEATURE_HTTPD_BASIC_AUTH("\t-r REALM\tAuthentication Realm for Basic Authentication\n") \ |
1200 | USE_FEATURE_HTTPD_AUTH_MD5("\t-m PASS\t\tCrypt PASS with md5 algorithm\n") \ | 1203 | USE_FEATURE_HTTPD_AUTH_MD5("\t-m PASS\t\tCrypt PASS with md5 algorithm\n") \ |