New applet, inetd, make httpd features more configurable, update authors, last_patch_80

from Vladimir N. Oleynik

AUTHORS

@@ -44,6 +44,9 @@ Magnus Damm <damm@opensource.se>
 Larry Doolittle <ldoolitt@recycle.lbl.gov>
     pristine source directory compilation, lots of patches and fixes.
 
+Glenn Engel <glenne@engel.org>
+    httpd
+
 Gennady Feldman <gfeldman@gena01.com>
     Sysklogd (single threaded syslogd, IPC Circular buffer support,
     logread), various fixes.
@@ -67,8 +70,8 @@ Glenn McGrath <bug1@optushome.com.au>
     ar, dpkg, dpkg-deb
 
 Vladimir Oleynik <dzo@simtreas.ru>
-    cmdedit; xargs(current);
+    cmdedit; xargs(current), httpd(current);
-    ports: ash, crond, fdisk, stty, traceroute, telnetd, top;
+    ports: ash, crond, fdisk, inetd, stty, traceroute, telnetd, top;
     locale, various fixes
     and irreconcilable critic of everything not perfect.
 

docs/busybox_footer.pod

@@ -113,8 +113,8 @@ Glenn McGrath <bug1@netconnect.com.au>
 
 Vladimir Oleynik <dzo@simtreas.ru>
 
-    cmdedit, xargs(current);
+    cmdedit, xargs(current), httpd(current);
-    ports: ash, crond, fdisk, stty, traceroute, telnetd, top;
+    ports: ash, crond, fdisk, inetd, stty, traceroute, telnetd, top;
     locale, various fixes
     and irreconcilable critic of everything not perfect.
 
@@ -166,6 +166,12 @@ Enrique Zanardi <ezanardi@ull.es>
 
     tarcat (since removed), loadkmap, various fixes, Debian maintenance
 
+=for html <br>
+
+Glenn Engel <glenne@engel.org>
+
+    httpd
+
 =cut
 
-# $Id: busybox_footer.pod,v 1.9 2002/11/26 22:00:19 bug1 Exp $
+# $Id: busybox_footer.pod,v 1.10 2003/02/09 06:51:12 bug1 Exp $

docs/busybox_header.pod

@@ -60,15 +60,16 @@ chmod, chown, chroot, chvt, clear, cmp,  cp,  cpio,  crond,  crontab,  cut,
 date, dc, dd, deallocvt,  deluser,  df,  dirname,  dmesg,  dos2unix,  dpkg,
 dpkg-deb, du, dumpkmap, dutmp, echo, expr, false,  fbset,  fdflush,  fdisk,
 find, free, freeramdisk, fsck.minix, getopt,  getty,  grep,  gunzip,  gzip,
-halt, head, hostid, hostname, id, ifconfig, init,  insmod,  kill,  killall,
+halt, head, hostid, hostname, httpd, id,  ifconfig,  inetd,  init,  insmod,
-klogd, length, ln, loadacm, loadfont, loadkmap, logger, logname, ls, lsmod,
+kill, killall, klogd, length,  ln,  loadacm,  loadfont,  loadkmap,  logger,
-makedevs, md5sum, mkdir, mkfifo, mkfs.minix, mknod, mkswap,  mktemp,  more,
+logname, ls, lsmod, makedevs, md5sum,  mkdir,  mkfifo,  mkfs.minix,  mknod,
-mount, mt, mv, nc, netstat, nslookup, ping, pivot_root,  poweroff,  printf,
+mkswap,  mktemp,  more,  mount,  mt,  mv,  nc,  netstat,  nslookup,   ping,
-ps, pwd, rdate, readlink, reboot, renice, reset, rm, rmdir,  rmmod,  route,
+pivot_root, poweroff, printf, ps, pwd,  rdate,  readlink,  reboot,  renice,
-rpm2cpio, sed, setkeycodes, sh, sleep, sort, stty, swapoff,  swapon,  sync,
+reset, rm, rmdir, rmmod, route,  rpm2cpio,  sed,  setkeycodes,  sh,  sleep,
-syslogd, tail, tar, tee, telnet, telnetd, test, tftp, time, top, touch, tr,
+sort, stty,  swapoff,  swapon,  sync,  syslogd,  tail,  tar,  tee,  telnet,
-true, tty, umount, uname, uniq, unix2dos, update, uptime, usleep, uudecode,
+telnetd, test, tftp, time, top, touch, tr, true, tty, umount, uname,  uniq,
-uuencode, watchdog, wc, wget, which, whoami, xargs, yes, zcat, [
+unix2dos, update, uptime, usleep, uudecode, uuencode, watchdog,  wc,  wget,
+which, whoami, xargs, yes, zcat, [
 
 =over 4
 

include/applets.h

@@ -265,6 +265,9 @@
 #ifdef CONFIG_IFUPDOWN
 	APPLET(ifup, ifupdown_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_INETD
+	APPLET(inetd, inetd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_INIT
 	APPLET(init, init_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif

include/usage.h

@@ -915,6 +915,14 @@
 	"\t-m\tdon't run any mappings\n" \
 	"\t-f\tforce de/configuration\n"
 	
+#define inetd_trivial_usage \
+	"[-q len] [conf]"
+#define inetd_full_usage \
+	"Usage: [-q len] [conf]\n\n" \
+	"Option:\n" \
+	"\t-q\tSets the size of the socket listen queue to\n" \
+	"the specified value. Default is 128."
+
 #define init_trivial_usage \
 	""
 #define init_full_usage \

networking/Config.in

@@ -41,6 +41,15 @@ config CONFIG_HTTPD
 	help
 	  Serve web pages via an HTTP server.
 
+config CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+	bool "  Support call from inetd only"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  This option disabling uid and port options for httpd applet
+	  and more others reducing size moments, but require
+	  internet superserver daemon for usaging.
+
 config CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	bool "  Enable Basic Authentication and IP address checking"
 	default n
@@ -49,6 +58,66 @@ config CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	  Utilizes /etc/httpd.conf for security settings allowing 
           ip address filtering and basic authentication on a per url basis.
 
+config CONFIG_FEATURE_HTTPD_CGI
+	bool "  Enable support Common Gateway Interface"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  Disable this for do very small module
+
+config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
+	bool "  Enable support reload global config file after hup signaled"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  Disable this for do very small module
+
+config CONFIG_FEATURE_HTTPD_SETUID
+	bool "  Enable support -u user option"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  Require for drop privilegies after bind() to privilegies port
+
+config CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
+	bool "  Enable support load from config file mime types"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  After set this you can adding or change mime types from file
+	  suffixes in config files
+
+config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+	bool "  Enable support set eviroment REMOTE_PORT"
+	default n
+	depends on CONFIG_FEATURE_HTTPD_CGI
+	help
+	  After set this your CGI script can know own remote port connecting
+
+config CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV
+	bool "  Enable support nonstandart httpd feature set CGI_var=value"
+	default n
+	depends on CONFIG_FEATURE_HTTPD_CGI
+	help
+	  After set this your CGI script can have trivial parse getted vars
+
+config CONFIG_FEATURE_HTTPD_DECODE_URL_STR
+	bool "  Support nonstandart httpd feature decode URL to stdout"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  After set this your can decode URL from -d argument to stdout,
+	  example -d "Hello%20World" as "Hello World"
+
+config CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
+	bool "  Support nonstandart httpd feature encode argument to URL"
+	default n
+	depends on CONFIG_HTTPD
+	help
+	  After set this your can encode from -d argument to stdout as URL,
+	  example -e "<Hello World>" as "%3CHello%20World%3E"
+
+
 config CONFIG_IFCONFIG
 	bool "ifconfig"
 	default n
@@ -132,6 +201,48 @@ config CONFIG_FEATURE_IFUPDOWN_MAPPING
 	  This enables support for the "mapping" stanza, unless you have
 	  a weird network setup you dont need it.
 
+config CONFIG_INETD
+	bool "inetd"
+	default n
+	help
+	  Internet superserver daemon
+
+config CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO
+	bool "  Support echo service"
+	default y
+	depends on CONFIG_INETD
+	help
+	  Echo received data internal inetd service
+
+config CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD
+	bool "  Support discard service"
+	default y
+	depends on CONFIG_INETD
+	help
+	  Internet /dev/null internal inetd service
+
+config CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME
+	bool "  Support time service"
+	default y
+	depends on CONFIG_INETD
+	help
+	  Return 32 bit time since 1900 internal inetd service
+
+config CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME
+	bool "  Support daytime service"
+	default y
+	depends on CONFIG_INETD
+	help
+	  Return human-readable time internal inetd service
+
+config CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
+	bool "  Support chargen service"
+	default y
+	depends on CONFIG_INETD
+	help
+	  Familiar character generator internal inetd service
+
+
 config CONFIG_IP
 	bool "ip"
 	default n
@@ -316,7 +427,7 @@ config CONFIG_TELNETD
 	  Please submit a patch to add help text for this item.
 
 config CONFIG_FEATURE_TELNETD_INETD
-	bool "  Use inetd"
+	bool "  Support call from inetd only"
 	default n
 	depends on CONFIG_TELNETD
 	help

networking/Makefile.in

@@ -30,6 +30,7 @@ NETWORKING-$(CONFIG_HOSTNAME)	+= hostname.o
 NETWORKING-$(CONFIG_HTTPD)	+= httpd.o
 NETWORKING-$(CONFIG_IFCONFIG)	+= ifconfig.o
 NETWORKING-$(CONFIG_IFUPDOWN)	+= ifupdown.o
+NETWORKING-$(CONFIG_INETD)      += inetd.o
 NETWORKING-$(CONFIG_IP)			+= ip.o
 NETWORKING-$(CONFIG_IPCALC)		+= ipcalc.o
 NETWORKING-$(CONFIG_IPADDR)		+= ipaddr.o