 @@ -1,14 +1,14 @@
-.\"	$NetBSD: bozohttpd.8,v 1.79 2019/02/28 08:28:21 mrg Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.80 2020/07/06 23:31:36 jmcneill Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
 .\" Copyright (c) 1997-2019 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 February 27, 2019
+.Dd July 6, 2020
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
 .Nm bozohttpd
 .Nd hyper text transfer protocol version 1.1 daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl EGHVXefhnsu
 .Op Fl C Ar suffix cgihandler
 .Op Fl I Ar port
 .Op Fl L Ar prefix script
 .Op Fl M Ar suffix type encoding encoding11
 .Op Fl P Ar pidfile
 .Op Fl R Ar readme
 .Op Fl S Ar server_software
 .Op Fl T Ar type timeout
 .Op Fl U Ar username
 .Op Fl Z Ar cert privkey
 .Op Fl c Ar cgibin
 .Op Fl i Ar address
 .Op Fl p Ar pubdir
 .Op Fl t Ar chrootdir
 .Op Fl v Ar virtualroot
 .Op Fl x Ar index
 .Op Fl z Ar ciphers
 .Ar slashdir
 .Op Ar myname
 @@ -222,26 +223,30 @@ 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
 Changes the default user directory for
 .Em /~user/
 translations from
 .Dq public_html
 to
 .Ar pubdir .
 .It Fl R Ar readme
 When directory indexing is enabled, include the contents of the file
 .Ar readme
 in the footer of the directory index.
 .It Fl S Ar server_software
 Sets the internal server version to
 .Ar server_software .
 .It Fl s
 Forces logging to be set to stderr always.
 .It Fl T Ar type timeout
 Set the timeout for
 .Ar type
 to
 .Ar timeout .
 The valid values of
 .Ar type
 are

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bozohttpd.h,v 1.60 2019/03/08 03:12:28 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.61 2020/07/06 23:31:36 jmcneill Exp $	*/
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2019 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
 @@ -107,26 +107,27 @@ typedef struct bozohttpd_t {
 	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		 enable_cgi_users;	/* use the cgi handler */
 	int		*sock;		/* bound sockets */
 	int		 nsock;		/* number of above */
 	struct pollfd	*fds;		/* current poll fd set */
 	int		 request_times;	/* # times a request was processed */
 	int		 dir_indexing;	/* handle directories */
 	const char	*dir_readme;	/* include README footer in indexes */
 	int		 hide_dots;	/* hide .* */
 	int		 process_cgi;	/* use the cgi handler */
 	char		*cgibin;	/* cgi-bin directory */
 	unsigned	ssl_timeout;	/* ssl timeout */
 	unsigned	initial_timeout;/* first line timeout */
 	unsigned	header_timeout;	/* header lines timeout */
 	unsigned	request_timeout;/* total session timeout */
 #ifndef NO_LUA_SUPPORT
 	int		 process_lua;	/* use the Lua handler */
 	SIMPLEQ_HEAD(, lua_state_map)	lua_states;
 #endif
 	void		*sslinfo;	/* pointer to ssl struct */
 	int		dynamic_content_map_size;/* size of dyn cont map */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir-index-bozo.c,v 1.32 2019/02/28 08:28:21 mrg Exp $	*/
+/*	$NetBSD: dir-index-bozo.c,v 1.33 2020/07/06 23:31:36 jmcneill Exp $	*/
 /*	$eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2019 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
 @@ -28,46 +28,49 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 /* this code implements directory index generation for bozohttpd */
 #ifndef NO_DIRINDEX_SUPPORT
 #include <sys/param.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <assert.h>
 #include "bozohttpd.h"
 /*
  * output a directory index.  return 1 if it actually did something..
  */
 int
 bozo_dir_index(bozo_httpreq_t *request, const char *dirpath, int isindex)
+{
 	bozohttpd_t *httpd = request->hr_httpd;
 	struct stat sb;
 	struct dirent **de, **deo;
 	DIR *dp;
 	char buf[MAXPATHLEN];
 	char *file = NULL, *printname = NULL, *p;
-	int k, j;
+	int k, j, fd;
 	ssize_t rlen;
 	if (!isindex || !httpd->dir_indexing)
 		return 0;
 	if (strlen(dirpath) <= strlen(httpd->index_html))
 		dirpath = ".";
 	else {
 		file = bozostrdup(httpd, request, dirpath);
 		file[strlen(file) - strlen(httpd->index_html)] = '\0';
 		dirpath = file;
+	}
 	debug((httpd, DEBUG_FAT, "bozo_dir_index: dirpath '%s'", dirpath));
 @@ -187,22 +190,39 @@ bozo_dir_index(bozo_httpreq_t *request,
 			bozo_printf(httpd, "<td>%s", buf);
 			len = ((unsigned long long)sb.st_size + 1023) / 1024;
 			bozo_printf(httpd, "<td align=right>%llukB", len);
+		}
 		bozo_printf(httpd, "\r\n");
+	}
 	closedir(dp);
 	while (k--)
         	free(deo[k]);
 	free(deo);
 	bozo_printf(httpd, "</table>\r\n");
 	if (httpd->dir_readme != NULL) {
 		if (httpd->dir_readme[0] == '/')
 			snprintf(buf, sizeof buf, "%s", httpd->dir_readme);
 		else
 			snprintf(buf, sizeof buf, "%s/%s", dirpath, httpd->dir_readme);
 		fd = open(buf, O_RDONLY);
 		if (fd != -1) {
 			bozo_flush(httpd, stdout);
 			do {
 				rlen = read(fd, buf, sizeof buf);
 				if (rlen <= 0)
 					break;
 				bozo_write(httpd, STDOUT_FILENO, buf, rlen);
 			} while (1);
 			close(fd);
+		}
+	}
 	bozo_printf(httpd, "</body></html>\r\n\r\n");
 	bozo_flush(httpd, stdout);
 done:
 	free(file);
 	free(printname);
 	return 1;
+}
 #endif /* NO_DIRINDEX_SUPPORT */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.22 2018/11/25 07:37:20 mrg Exp $	*/
+/*	$NetBSD: main.c,v 1.23 2020/07/06 23:31:36 jmcneill Exp $	*/
 /*	$eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
 /*
  * Copyright (c) 1997-2018 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.
 @@ -150,27 +150,27 @@ main(int argc, char **argv)
 		progname = argv[0];
 	else
 		progname++;
 	openlog(progname, LOG_PID|LOG_NDELAY, LOG_FTP);
 	bozo_set_defaults(&httpd, &prefs);
 	/*
 	 * -r option was removed, do not reuse it for a while
 	 */
 	while ((c = getopt(argc, argv,
-	    "C:EGHI:L:M:P:S:T:U:VXZ:bc:defhi:np:st:uv:x:z:")) != -1) {
+	    "C:EGHI:L:M:P:R:S:T:U:VXZ:bc:defhi:np:st:uv:x:z:")) != -1) {
 		switch (c) {
 		case 'b':
 			if (!have_daemon_mode)
  no_daemon_mode:
 				bozoerr(&httpd, 1, "Daemon mode not enabled");
 			/*
 			 * test suite support - undocumented
 			 * background == 2 (aka, -b -b) means to
 			 * only process 1 per kid
 			 */
 			val = bozo_get_pref(&prefs, "background") == NULL ?
 @@ -289,26 +289,31 @@ main(int argc, char **argv)
 				goto no_daemon_mode;
 			bozo_set_pref(&httpd, &prefs, "pid file", optarg);
 			break;
 		case 'p':
 			if (!have_user)
  no_user_support:
 				bozoerr(&httpd, 1, "User support not enabled");
 			bozo_set_pref(&httpd, &prefs, "public_html", optarg);
 			break;
 		case 'R':
 			bozo_set_pref(&httpd, &prefs, "directory index readme",
 				      optarg);
 			break;
 		case 'S':
 			bozo_set_pref(&httpd, &prefs, "server software",
 				      optarg);
 			break;
 		case 's':
 			bozo_set_pref(&httpd, &prefs, "log to stderr", "true");
 			break;
 		case 'T':
 			/* make sure there're two arguments */
 			if (argc - optind < 1)
 				usage(&httpd, progname);

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: bozohttpd.c,v 1.114 2020/06/07 23:33:02 fox Exp $ */	1	/* $NetBSD: bozohttpd.c,v 1.115 2020/07/06 23:31:36 jmcneill Exp $ */
2		2
3	/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */	3	/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
4		4
5	/*	5	/*
6	* Copyright (c) 1997-2019 Matthew R. Green	6	* Copyright (c) 1997-2019 Matthew R. Green
7	* All rights reserved.	7	* All rights reserved.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -2560,26 +2560,29 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs		@@ -2560,26 +2560,29 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs
2560	}	2560	}
2561	if ((cp = bozo_get_pref(prefs, "dirty environment")) != NULL &&	2561	if ((cp = bozo_get_pref(prefs, "dirty environment")) != NULL &&
2562	strcmp(cp, "true") == 0) {	2562	strcmp(cp, "true") == 0) {
2563	dirtyenv = 1;	2563	dirtyenv = 1;
2564	}	2564	}
2565	if ((cp = bozo_get_pref(prefs, "hide dots")) != NULL &&	2565	if ((cp = bozo_get_pref(prefs, "hide dots")) != NULL &&
2566	strcmp(cp, "true") == 0) {	2566	strcmp(cp, "true") == 0) {
2567	httpd->hide_dots = 1;	2567	httpd->hide_dots = 1;
2568	}	2568	}
2569	if ((cp = bozo_get_pref(prefs, "directory indexing")) != NULL &&	2569	if ((cp = bozo_get_pref(prefs, "directory indexing")) != NULL &&
2570	strcmp(cp, "true") == 0) {	2570	strcmp(cp, "true") == 0) {
2571	httpd->dir_indexing = 1;	2571	httpd->dir_indexing = 1;
2572	}	2572	}
		2573	if ((cp = bozo_get_pref(prefs, "directory index readme")) != NULL) {
		2574	httpd->dir_readme = bozostrdup(httpd, NULL, cp);
		2575	}
2573	if ((cp = bozo_get_pref(prefs, "public_html")) != NULL) {	2576	if ((cp = bozo_get_pref(prefs, "public_html")) != NULL) {
2574	httpd->public_html = bozostrdup(httpd, NULL, cp);	2577	httpd->public_html = bozostrdup(httpd, NULL, cp);
2575	}	2578	}
2576	if ((cp = bozo_get_pref(prefs, "ssl timeout")) != NULL) {	2579	if ((cp = bozo_get_pref(prefs, "ssl timeout")) != NULL) {
2577	httpd->ssl_timeout = atoi(cp);	2580	httpd->ssl_timeout = atoi(cp);
2578	}	2581	}
2579	if ((cp = bozo_get_pref(prefs, "initial timeout")) != NULL) {	2582	if ((cp = bozo_get_pref(prefs, "initial timeout")) != NULL) {
2580	httpd->initial_timeout = atoi(cp);	2583	httpd->initial_timeout = atoi(cp);
2581	}	2584	}
2582	if ((cp = bozo_get_pref(prefs, "header timeout")) != NULL) {	2585	if ((cp = bozo_get_pref(prefs, "header timeout")) != NULL) {
2583	httpd->header_timeout = atoi(cp);	2586	httpd->header_timeout = atoi(cp);
2584	}	2587	}
2585	if ((cp = bozo_get_pref(prefs, "request timeout")) != NULL) {	2588	if ((cp = bozo_get_pref(prefs, "request timeout")) != NULL) {