Index: CHANGES
===================================================================
RCS file: /cvsroot/src/libexec/httpd/CHANGES,v
retrieving revision 1.19.2.4
diff -p -u -u -r1.19.2.4 CHANGES
--- CHANGES	23 Dec 2016 07:42:09 -0000	1.19.2.4
+++ CHANGES	11 Feb 2017 10:24:13 -0000
@@ -1,7 +1,12 @@
 $NetBSD: CHANGES,v 1.19.2.4 2016/12/23 07:42:09 snj Exp $
 
+changes in bozohttpd 20170201:
+	o  fix an infinite loop in cgi processing
+	o  fixes and clean up for the testsuite
+	o  no longer sends encoding header for compressed formats
+
 changes in bozohttpd 20160517:
-	o add a bozo_get_version() function which returns the version number
+	o  add a bozo_get_version() function which returns the version number
 
 changes in bozohttpd 20160415:
 	o  add search-word support for CGI
Index: bozohttpd.8
===================================================================
RCS file: /cvsroot/src/libexec/httpd/bozohttpd.8,v
retrieving revision 1.46.4.7
diff -p -u -u -r1.46.4.7 bozohttpd.8
--- bozohttpd.8	23 Dec 2016 07:42:09 -0000	1.46.4.7
+++ bozohttpd.8	11 Feb 2017 10:24:14 -0000
@@ -2,7 +2,7 @@
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
-.\" Copyright (c) 1997-2016 Matthew R. Green
+.\" Copyright (c) 1997-2017 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 11, 2016
+.Dd February 1, 2017
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -190,7 +190,7 @@ when a URL in the form
 is being accessed.
 The function is passed three tables as arguments, the server
 environment, the request headers, and the decoded query string
-plus any data that was send as application/x-www-form-urlencoded.
+plus any data that was sent as application/x-www-form-urlencoded.
 .It Fl M Ar suffix type encoding encoding11
 Adds a new entry to the table that converts file suffixes to
 content type and encoding.
@@ -384,7 +384,7 @@ user transformations (NO_USER_SUPPORT),
 directory index support (NO_DIRINDEX_SUPPORT),
 daemon mode support (NO_DAEMON_MODE),
 dynamic MIME content (NO_DYNAMIC_CONTENT),
-Lua suport (NO_LUA_SUPPORT),
+Lua support (NO_LUA_SUPPORT),
 and SSL support (NO_SSL_SUPPORT)
 by defining the listed macros when building
 .Nm .
@@ -446,7 +446,7 @@ with
 on the compiler command line.
 .Ss COMPRESSION
 .Nm
-supports a very basic form compression.
+supports a very basic form of compression.
 .Nm
 will serve the requested file postpended with
 .Dq Pa .gz
@@ -531,7 +531,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20160720.
+version 20170201.
 .Sh AUTHORS
 .An -nosplit
 .Nm
@@ -631,6 +631,10 @@ provided some clean up for memory leaks
 .Aq Mt jlam@NetBSD.org
 provided man page fixes
 .It
+.An Dennis Lindroos
+.Aq Mt denafcm@gmail.com
+provided a cgi-bin fix
+.It
 .An Julio Merino
 .Aq Mt jmmv@NetBSD.org
 Added the
Index: bozohttpd.c
===================================================================
RCS file: /cvsroot/src/libexec/httpd/bozohttpd.c,v
retrieving revision 1.56.2.7
diff -p -u -u -r1.56.2.7 bozohttpd.c
--- bozohttpd.c	23 Dec 2016 07:42:09 -0000	1.56.2.7
+++ bozohttpd.c	11 Feb 2017 10:24:14 -0000
@@ -3,7 +3,7 @@
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2016 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20160720"
+#define SERVER_SOFTWARE		"bozohttpd/20170201"
 #endif
 #ifndef DIRECT_ACCESS_FILE
 #define DIRECT_ACCESS_FILE	".bzdirect"
Index: bozohttpd.h
===================================================================
RCS file: /cvsroot/src/libexec/httpd/bozohttpd.h,v
retrieving revision 1.33.2.5
diff -p -u -u -r1.33.2.5 bozohttpd.h
--- bozohttpd.h	23 Dec 2016 07:42:09 -0000	1.33.2.5
+++ bozohttpd.h	11 Feb 2017 10:24:14 -0000
@@ -3,7 +3,7 @@
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2015 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
Index: cgi-bozo.c
===================================================================
RCS file: /cvsroot/src/libexec/httpd/cgi-bozo.c,v
retrieving revision 1.25.2.6
diff -p -u -u -r1.25.2.6 cgi-bozo.c
--- cgi-bozo.c	23 Dec 2016 07:42:09 -0000	1.25.2.6
+++ cgi-bozo.c	11 Feb 2017 10:24:14 -0000
@@ -3,7 +3,7 @@
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2015 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -235,7 +235,8 @@ parse_search_string(bozo_httpreq_t *requ
 	 */
 	*args_len = 1;
 	/* count '+' in str */
-	for (s = str; (s = strchr(s, '+')); (*args_len)++);
+	for (s = str; (s = strchr(s, '+')); (*args_len)++)
+		s++;
 	
 	args = bozomalloc(httpd, sizeof(*args) * (*args_len + 1));
  
Index: testsuite/Makefile
===================================================================
RCS file: /cvsroot/src/libexec/httpd/testsuite/Makefile,v
retrieving revision 1.4.24.2
diff -p -u -u -r1.4.24.2 Makefile
--- testsuite/Makefile	23 Dec 2016 07:42:09 -0000	1.4.24.2
+++ testsuite/Makefile	11 Feb 2017 10:24:14 -0000
@@ -1,6 +1,7 @@
 #	$eterna: Makefile,v 1.14 2009/05/22 21:51:39 mrg Exp $
 
 SIMPLETESTS=	t1 t2 t3 t4 t5 t6 t7 t8 t9 t10
+CGITESTS=	t11
 BIGFILETESTS=	partial4000 partial8000
 
 BOZOHTTPD?=	../bozohttpd
@@ -22,11 +23,16 @@ clean:
 		rm -f tmp.$$a.out tmp.$$a.err; \
 	done
 
-check: check-simple check-bigfile
+check: check-simple check-cgi check-bigfile
 
 check-simple:
 .for a in $(SIMPLETESTS)
-	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${VERBOSE}"
+	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}"
+.endfor
+
+check-cgi:
+.for a in $(CGITESTS)
+	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}" -c "${.CURDIR}/cgi-bin"
 .endfor
 
 check-bigfile:
Index: testsuite/html_cmp
===================================================================
RCS file: /cvsroot/src/libexec/httpd/testsuite/html_cmp,v
retrieving revision 1.4
diff -p -u -u -r1.4 html_cmp
--- testsuite/html_cmp	18 Nov 2011 09:51:31 -0000	1.4
+++ testsuite/html_cmp	11 Feb 2017 10:24:14 -0000
@@ -2,12 +2,20 @@
 #
 #	$eterna: html_cmp,v 1.9 2011/11/17 22:18:02 mrg Exp $
 #
-# like cmp(1) but compares to files after making their `Date: ' headers
-# the same, to allow `now' and `then' to work properly.  it also tries
-# to find servername's that might be the local host and converts those
-# as well..
+# like cmp(1)/diff(1) but compares to files after making their
+# `Date: ' headers the same, to allow `now' and `then' to work properly.
+# it also tries to find servername's that might be the local host and
+# converts those as well..
 #
-# it must be called like `cmp file1 file1' *only*.  
+# it must be called like `html_cmp cmp|diff file1 file1' *only*.
+
+if [ "cmp" = "$1" ]; then
+	cmd="cmp -s"
+elif [ "diff" = "$1" ]; then
+	cmd="diff -u"
+else
+	exit 77
+fi
 
 h=`hostname || uname -n`
 
@@ -17,10 +25,10 @@ sedcmd="s/^Date: .*/Date: nowish/;
 	s/^Server: .*/^Server: bozotic HTTP server version 5.08/;
 	s/^Content-Length: .*/Content-Length: 223/;"
 
-sed -e "$sedcmd" < "$1" > "f1.tmp.$$"
-sed -e "$sedcmd" < "$2" > "f2.tmp.$$"
+sed -e "$sedcmd" < "$2" > "f1.tmp.$$"
+sed -e "$sedcmd" < "$3" > "f2.tmp.$$"
 
-cmp -s "f1.tmp.$$" "f2.tmp.$$"
+${cmd} "f1.tmp.$$" "f2.tmp.$$"
 rv=$?
 rm -f "f1.tmp.$$" "f2.tmp.$$"
 
Index: testsuite/t11.in
===================================================================
RCS file: testsuite/t11.in
diff -N testsuite/t11.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/t11.in	11 Feb 2017 10:24:14 -0000
@@ -0,0 +1,3 @@
+GET /cgi-bin/echo.bat?&dir+c:\\ HTTP/1.1
+Host: 
+
Index: testsuite/t11.out
===================================================================
RCS file: testsuite/t11.out
diff -N testsuite/t11.out
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/t11.out	11 Feb 2017 10:24:14 -0000
@@ -0,0 +1 @@
+HTTP/1.1 200 OK
Index: testsuite/test-bigfile
===================================================================
RCS file: /cvsroot/src/libexec/httpd/testsuite/test-bigfile,v
retrieving revision 1.1.1.1.30.2
diff -p -u -u -r1.1.1.1.30.2 test-bigfile
--- testsuite/test-bigfile	23 Dec 2016 07:42:09 -0000	1.1.1.1.30.2
+++ testsuite/test-bigfile	11 Feb 2017 10:24:14 -0000
@@ -7,30 +7,35 @@ wget="$3"
 datadir="$4"
 verbose="$5"
 
+tmperr="tmp.$test.err"
+
 if [ "yes" = "$verbose" ]; then
 	echo "Running test $test"
 else
-	exec 2>tmp.$test.err
+	exec 2>"$tmperr"
 fi
 
 bozotestport=11111
 
 # copy beginning file
-cp ${datadir}/bigfile.${test} ./bigfile
+cp "${datadir}/bigfile.${test}" ./bigfile
 
 # fire up bozohttpd
-${bozohttpd} -b -b -I ${bozotestport} -n -s -f ${datadir} &
+${bozohttpd} -b -b -I ${bozotestport} -n -s -f "${datadir}" &
 bozopid=$!
 
-${wget} -c http://localhost:${bozotestport}/bigfile
+"${wget}" -c http://localhost:${bozotestport}/bigfile
 
 kill -9 $bozopid
 
-if cmp ./bigfile ${datadir}/bigfile; then
+if cmp ./bigfile "${datadir}/bigfile"; then
 	rm -f ./bigfile
 	exit 0
 else
 	rm -f ./bigfile
-	[ "yes" = "$verbose" ] || echo "Failed test $test: `cat tmp.$test.err`"
+	if [ "yes" = "$verbose" ]; then
+		echo "Failed test $test:"
+		cat "$tmperr"
+	fi
 	exit 1
 fi
Index: testsuite/test-simple
===================================================================
RCS file: /cvsroot/src/libexec/httpd/testsuite/test-simple,v
retrieving revision 1.2.4.2
diff -p -u -u -r1.2.4.2 test-simple
--- testsuite/test-simple	23 Dec 2016 07:42:09 -0000	1.2.4.2
+++ testsuite/test-simple	11 Feb 2017 10:24:14 -0000
@@ -1,23 +1,33 @@
 #! /bin/sh
-# $NetBSD: test-simple,v 1.2.4.2 2016/12/23 07:42:09 snj Exp $
+# $NetBSD: test-simple,v 1.4 2017/01/31 14:33:54 mrg Exp $
 
-test="$1"
-bozohttpd="$2"
-datadir="$3"
-verbose="$4"
+test="$1"; shift
+bozohttpd="$1"; shift
+datadir="$1"; shift
+curdir="$1"; shift
+verbose="$1"; shift
+
+in="$curdir/$test.in"
+out="$curdir/$test.out"
+tmpout="tmp.$test.out"
+tmperr="tmp.$test.err"
 
 if [ "yes" = "$verbose" ]; then
 	echo "Running test $test"
 else
-	exec 2>tmp.$test.err
+	exec 2>"$tmperr"
 fi
 
 bozotestport=11111
 
-${bozohttpd} ${datadir} < $test.in > tmp.$test.out
-if ./html_cmp $test.out tmp.$test.out; then
+${bozohttpd} "$@" "${datadir}" < "$in" > "$tmpout"
+if "$curdir/html_cmp" cmp "$out" "$tmpout"; then
 	exit 0
 else
-	[ "yes" = "$verbose" ] || echo "Failed test $test: `cat tmp.$test.err; echo; cat $test.out`"
+	if [ "yes" = "$verbose" ]; then
+		echo "Failed test $test:"
+		cat "$tmperr"
+		$curdir/html_cmp diff "$out" "$tmpout"
+	fi
 	exit 1
 fi