[src/netbsd-7-0]: src/doc bah, combine revisions for ticket 1357

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dea6e2c68cc1
branches:  netbsd-7-0
changeset: 801282:dea6e2c68cc1
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Feb 12 22:03:49 2017 +0000

description:
bah, combine revisions for ticket 1357

diffstat:

 doc/CHANGES-7.0.3 |  15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r 6e7c0dd0c8ed -r dea6e2c68cc1 doc/CHANGES-7.0.3
--- a/doc/CHANGES-7.0.3 Sun Feb 12 22:00:49 2017 +0000
+++ b/doc/CHANGES-7.0.3 Sun Feb 12 22:03:49 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.24 2017/02/12 22:00:49 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.25 2017/02/12 22:03:49 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -351,14 +351,10 @@
        [spz, ticket #1352]
 
 libexec/httpd/CHANGES                          1.25
-libexec/httpd/bozohttpd.8                      1.63
-libexec/httpd/bozohttpd.8                      1.64
-libexec/httpd/bozohttpd.8                      1.65
-libexec/httpd/bozohttpd.c                      1.85
-libexec/httpd/bozohttpd.c                      1.86
+libexec/httpd/bozohttpd.8                      1.63-1.65
+libexec/httpd/bozohttpd.c                      1.85, 1.86
 libexec/httpd/bozohttpd.h                      1.47
-libexec/httpd/cgi-bozo.c                       1.36
-libexec/httpd/cgi-bozo.c                       1.37
+libexec/httpd/cgi-bozo.c                       1.36, 1.37
 libexec/httpd/libbozohttpd/libbozohttpd.3      1.4
 libexec/httpd/testsuite/Makefile               1.7
 libexec/httpd/testsuite/cgi-bin/empty          1.1
@@ -366,8 +362,7 @@
 libexec/httpd/testsuite/t11.in                 1.1
 libexec/httpd/testsuite/t11.out                        1.1
 libexec/httpd/testsuite/test-bigfile           1.4
-libexec/httpd/testsuite/test-simple            1.3
-libexec/httpd/testsuite/test-simple            1.4
+libexec/httpd/testsuite/test-simple            1.3, 1.4
 
        Update bozohttpd to 20170201:
        - fix an infinite loop in cgi processing