 @@ -1,14 +1,14 @@
-.\"	$NetBSD: bozohttpd.8,v 1.25 2011/03/10 14:37:16 reed Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.26 2011/03/29 07:22:31 jmmv Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.99 2010/09/20 22:26:28 mrg Exp $
 .\"
 .\" Copyright (c) 1997-2010 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -16,40 +16,41 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 20, 2010
+.Dd March 25, 2011
 .Dt HTTPD 8
 .Os
 .Sh NAME
 .Nm httpd
 .Nd hyper text transfer protocol version 1.1 daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl befHnrsuVX
 .Op Fl C Ar suffix cgihandler
 .Op Fl c Ar cgibin
 .Op Fl I Ar port
 .Op Fl i Ar address
 .Op Fl M Ar suffix type encoding encoding11
 .Op Fl P Ar pidfile
 .Op Fl p Ar pubdir
 .Op Fl S Ar server_software
 .Op Fl t Ar chrootdir
 .Op Fl v Ar virtualroot
 .Op Fl x Ar index
 .Op Fl Z Ar cert privkey
 .Ar slashdir
 .Op Ar myname
 .Sh DESCRIPTION
 The
 .Nm
 program reads a
 .Em HTTP
 @@ -171,26 +172,34 @@ If any of these are a single dash
 the empty string is used instead.
 Multiple
 .Fl M
 options may be passed.
 .It Fl n
 This option stops
 .Nm
 from doing IP address to name resolution of hosts for setting the
 .Ev REMOTE_HOST
 variable before running a CGI program.
 This option has no effect without the
 .Fl c
 option.
 .It Fl P Ar pidfile
 This option causes
 .Nm
 to create a pid file in
 .Ar pidfile
 when run in daemon mode with the
 .Fl b
 option.
 .It Fl p Ar pubdir
 This option changes the default user directory for
 .Em /~user/
 translations from
 .Dq public_html
 to
 .Ar pubdir .
 .It Fl r
 This option forces pages besides the
 .Dq index.html
 (see the
 .Fl X
 option) page to require that the Referrer: header be present and

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bozohttpd.c,v 1.26 2011/01/12 19:29:24 pooka Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.27 2011/03/29 07:22:31 jmmv Exp $	*/
 /*	$eterna: bozohttpd.c,v 1.176 2010/09/20 22:26:28 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -1987,26 +1987,29 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs
 	    strcmp(cp, "true") == 0) {
 		httpd->logstderr = 1;
+	}
 	if ((cp = bozo_get_pref(prefs, "bind address")) != NULL) {
 		httpd->bindaddress = strdup(cp);
+	}
 	if ((cp = bozo_get_pref(prefs, "background")) != NULL) {
 		httpd->background = atoi(cp);
+	}
 	if ((cp = bozo_get_pref(prefs, "foreground")) != NULL &&
 	    strcmp(cp, "true") == 0) {
 		httpd->foreground = 1;
+	}
 	if ((cp = bozo_get_pref(prefs, "pid file")) != NULL) {
 		httpd->pidfile = strdup(cp);
+	}
 	if ((cp = bozo_get_pref(prefs, "unknown slash")) != NULL &&
 	    strcmp(cp, "true") == 0) {
 		httpd->unknown_slash = 1;
+	}
 	if ((cp = bozo_get_pref(prefs, "virtual base")) != NULL) {
 		httpd->virtbase = strdup(cp);
+	}
 	if ((cp = bozo_get_pref(prefs, "enable users")) != NULL &&
 	    strcmp(cp, "true") == 0) {
 		httpd->enable_users = 1;
+	}
 	if ((cp = bozo_get_pref(prefs, "dirty environment")) != NULL &&
 	    strcmp(cp, "true") == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bozohttpd.h,v 1.17 2010/09/20 23:11:38 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.18 2011/03/29 07:22:31 jmmv Exp $	*/
 /*	$eterna: bozohttpd.h,v 1.37 2010/09/20 22:26:28 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -66,26 +66,27 @@ typedef struct bozo_consts_t {
 } bozo_consts_t;
 /* this structure encapsulates all the bozo flags and control vars */
 typedef struct bozohttpd_t {
 	char		*rootdir;	/* root directory */
 	char		*username;	/* username to switch to */
 	int		 numeric;	/* avoid gethostby*() */
 	char		*virtbase;	/* virtual directory base */
 	int		 unknown_slash;	/* unknown vhosts go to normal slashdir */
 	int		 untrustedref;	/* make sure referrer = me unless url = / */
 	int		 logstderr;	/* log to stderr (even if not tty) */
 	int		 background;	/* drop into daemon mode */
 	int		 foreground;	/* keep daemon mode in foreground */
 	char		*pidfile;	/* path to the pid file, if any */
 	size_t		 page_size;	/* page size */
 	char		*slashdir;	/* www slash directory */
 	char		*bindport;	/* bind port; default "http" */
 	char		*bindaddress;	/* address for binding - INADDR_ANY */
 	int		 debug;		/* debugging level */
 	char		*virthostname;	/* my name */
 	const char	*server_software;/* our brand :-) */
 	const char	*index_html;	/* our home page */
 	const char	*public_html;	/* ~user/public_html page */
 	int		 enable_users;	/* enable public_html */
 	int		*sock;		/* bound sockets */
 	int		 nsock;		/* number of above */
 	struct pollfd	*fds;		/* current poll fd set */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: daemon-bozo.c,v 1.12 2011/02/06 19:00:53 pooka Exp $	*/
+/*	$NetBSD: daemon-bozo.c,v 1.13 2011/03/29 07:22:31 jmmv Exp $	*/
 /*	$eterna: daemon-bozo.c,v 1.22 2010/06/21 06:45:45 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,55 +30,106 @@
+ *
  */
 /* this code implements daemon mode for bozohttpd */
 #ifndef NO_DAEMON_MODE
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <assert.h>
 #include <errno.h>
 #include <netdb.h>
 #include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "bozohttpd.h"
 static	void	sigchild(int);	/* SIGCHLD handler */
 #ifndef POLLRDNORM
 #define POLLRDNORM 0
 #endif
 #ifndef POLLRDBAND
 #define POLLRDBAND 0
 #endif
 #ifndef INFTIM
 #define INFTIM -1
 #endif
 static const char* pidfile_path = NULL;
 static pid_t pidfile_pid = 0;
 /* ARGSUSED */
 static void
 sigchild(int signo)
+{
 	while (waitpid(-1, NULL, WNOHANG) > 0) {
+	}
+}
 /* Signal handler to exit in a controlled manner.  This ensures that
  * any atexit(3) handlers are properly executed. */
 /* ARGSUSED */
 static void
 controlled_exit(int signo)
+{
 	exit(EXIT_SUCCESS);
+}
 static void
 remove_pidfile(void)
+{
 	if (pidfile_path != NULL && pidfile_pid == getpid()) {
 		(void)unlink(pidfile_path);
 		pidfile_path = NULL;
+	}
+}
 static void
 create_pidfile(bozohttpd_t *httpd)
+{
 	FILE *file;
 	assert(pidfile_path == NULL);
 	if (httpd->pidfile == NULL)
 		return;
 	if (atexit(remove_pidfile) == -1)
 		bozo_err(httpd, 1, "Failed to install pidfile handler");
 	if ((file = fopen(httpd->pidfile, "w")) == NULL)
 		bozo_err(httpd, 1, "Failed to create pidfile '%s'",
 		    httpd->pidfile);
 	(void)fprintf(file, "%d\n", getpid());
 	(void)fclose(file);
 	pidfile_path = httpd->pidfile;
 	pidfile_pid = getpid();
 	debug((httpd, DEBUG_FAT, "Created pid file '%s' for pid %d",
 	    pidfile_path, pidfile_pid));
+}
 void
 bozo_daemon_init(bozohttpd_t *httpd)
+{
 	struct addrinfo h, *r, *r0;
 	const char	*portnum;
 	int e, i, on = 1;
 	if (!httpd->background)
 		return;
 	portnum = (httpd->bindport) ? httpd->bindport : "http";
 	memset(&h, 0, sizeof(h));
 @@ -109,29 +160,35 @@ bozo_daemon_init(bozohttpd_t *httpd)
 		httpd->fds[i].events = POLLIN | POLLPRI | POLLRDNORM |
 				POLLRDBAND | POLLERR;
 		httpd->fds[i].fd = httpd->sock[i];
 		i++;
+	}
 	if (i == 0)
 		bozo_err(httpd, 1, "could not find any addresses to bind");
 	httpd->nsock = i;
 	freeaddrinfo(r0);
 	if (httpd->foreground == 0)
 		daemon(1, 0);
 	create_pidfile(httpd);
 	bozo_warn(httpd, "started in daemon mode as `%s' port `%s' root `%s'",
 	    httpd->virthostname, portnum, httpd->slashdir);
 	signal(SIGHUP, controlled_exit);
 	signal(SIGINT, controlled_exit);
 	signal(SIGTERM, controlled_exit);
 	signal(SIGCHLD, sigchild);
+}
 void
 bozo_daemon_closefds(bozohttpd_t *httpd)
+{
 	int i;
 	for (i = 0; i < httpd->nsock; i++)
 		close(httpd->sock[i]);
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.1.1.2 2010/09/20 23:07:21 mrg Exp $	*/
+/*	$NetBSD: main.c,v 1.2 2011/03/29 07:22:31 jmmv Exp $	*/
 /*	$eterna: main.c,v 1.4 2010/07/11 00:34:28 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -79,26 +79,27 @@ usage(bozohttpd_t *httpd, char *progname
 #ifndef NO_CGIBIN_SUPPORT
 #ifndef NO_DYNAMIC_CONTENT
 	bozo_warn(httpd, "   -C arg prog\t\tadd this CGI handler");
 #endif
 	bozo_warn(httpd,
 		"   -c cgibin\t\tenable cgi-bin support in this directory");
 #endif
 #ifndef NO_DAEMON_MODE
 	bozo_warn(httpd, "   -b\t\t\tbackground and go into daemon mode");
 	bozo_warn(httpd, "   -f\t\t\tkeep daemon mode in the foreground");
 	bozo_warn(httpd,
 		"   -i address\t\tbind on this address (daemon mode only)");
 	bozo_warn(httpd, "   -I port\t\tbind on this port (daemon mode only)");
 	bozo_warn(httpd, "   -P pidfile\t\tpath to the pid file to create");
 #endif
 	bozo_warn(httpd, "   -S version\t\tset server version string");
 	bozo_warn(httpd, "   -t dir\t\tchroot to `dir'");
 	bozo_warn(httpd, "   -U username\t\tchange user to `user'");
 	bozo_warn(httpd,
 		"   -e\t\t\tdon't clean the environment (-t and -U only)");
 	bozo_warn(httpd,
 		"   -v virtualroot\tenable virtual host support "
 		"in this directory");
 	bozo_warn(httpd,
 		"   -r\t\t\tmake sure sub-pages come from "
 		"this host via referrer");
 #ifndef NO_DIRINDEX_SUPPORT
 @@ -131,27 +132,27 @@ main(int argc, char **argv)
 	(void) memset(&httpd, 0x0, sizeof(httpd));
 	(void) memset(&prefs, 0x0, sizeof(prefs));
 	if ((progname = strrchr(argv[0], '/')) == NULL)
 		progname = argv[0];
 	else
 		progname++;
 	openlog(progname, LOG_PID|LOG_NDELAY, LOG_FTP);
 	bozo_set_defaults(&httpd, &prefs);
 	while ((c = getopt(argc, argv,
-			   "C:HI:M:S:U:VXZ:bc:defhi:np:rst:uv:x:z:")) != -1) {
+			   "C:HI:M:P:S:U:VXZ:bc:defhi:np:rst:uv:x:z:")) != -1) {
 		switch(c) {
 		case 'M':
 #ifdef NO_DYNAMIC_CONTENT
 			bozo_err(&httpd, 1,
 				"dynamic mime content support is not enabled");
 			/* NOTREACHED */
 #else
 			/* make sure there's four arguments */
 			if (argc - optind < 3)
 				usage(&httpd, progname);
 			bozo_add_content_map_mime(&httpd, optarg, argv[optind],
 			    argv[optind+1], argv[optind+2]);
 @@ -197,26 +198,27 @@ main(int argc, char **argv)
 			bozo_set_pref(&prefs, "virtual base", optarg);
 			break;
 		case 'x':
 			bozo_set_pref(&prefs, "index.html", optarg);
 			break;
 #ifdef NO_DAEMON_MODE
 		case 'b':
 		case 'e':
 		case 'f':
 		case 'i':
 		case 'I':
 		case 'P':
 			bozo_err(&httpd, 1, "Daemon mode is not enabled");
 			/* NOTREACHED */
 #else
 		case 'b':
 			/*
 			 * test suite support - undocumented
 			 * background == 2 (aka, -b -b) means to
 			 * only process 1 per kid
 			 */
 			if (bozo_get_pref(&prefs, "background") == NULL) {
 				bozo_set_pref(&prefs, "background", "1");
 			} else {
 				bozo_set_pref(&prefs, "background", "2");
 @@ -228,26 +230,29 @@ main(int argc, char **argv)
 			break;
 		case 'f':
 			bozo_set_pref(&prefs, "foreground", "true");
 			break;
 		case 'i':
 			bozo_set_pref(&prefs, "bind address", optarg);
 			break;
 		case 'I':
 			bozo_set_pref(&prefs, "port number", optarg);
 			break;
 		case 'P':
 			bozo_set_pref(&prefs, "pid file", optarg);
 			break;
 #endif /* NO_DAEMON_MODE */
 #ifdef NO_CGIBIN_SUPPORT
 		case 'c':
 		case 'C':
 			bozo_err(&httpd, 1, "CGI is not enabled");
 			/* NOTREACHED */
 #else
 		case 'c':
 			bozo_cgi_setbin(&httpd, optarg);
 			break;
 		case 'C':