[src/trunk]: src/libexec/httpd merge 20100510 properly

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

details:   https://anonhg.NetBSD.org/src/rev/c9c05350da30
branches:  trunk
changeset: 754728:c9c05350da30
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon May 10 14:53:17 2010 +0000

description:
merge 20100510 properly

diffstat:

 libexec/httpd/bozohttpd.8 |  7 ++++---
 libexec/httpd/bozohttpd.c |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 8d2ec1d10d87 -r c9c05350da30 libexec/httpd/bozohttpd.8
--- a/libexec/httpd/bozohttpd.8 Mon May 10 14:44:19 2010 +0000
+++ b/libexec/httpd/bozohttpd.8 Mon May 10 14:53:17 2010 +0000
@@ -1,6 +1,6 @@
-.\"    $NetBSD: bozohttpd.8,v 1.17 2010/05/10 03:37:45 mrg Exp $
+.\"    $NetBSD: bozohttpd.8,v 1.18 2010/05/10 14:53:17 mrg Exp $
 .\"
-.\"    $eterna: bozohttpd.8,v 1.93 2010/05/10 02:51:28 mrg Exp $
+.\"    $eterna: bozohttpd.8,v 1.94 2010/05/10 14:49:19 mrg Exp $
 .\"
 .\" Copyright (c) 1997-2010 Matthew R. Green
 .\" All rights reserved.
@@ -27,6 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd May 22, 2009
+.Dd May 10, 2010
 .Dt HTTPD 8
 .Os
 .Sh NAME
@@ -458,7 +459,7 @@
 and regular code audits.
 This manual documents
 .Nm
-version 20090522.
+version 20100510.
 .Sh AUTHORS
 .Nm
 was written by Matthew R. Green
diff -r 8d2ec1d10d87 -r c9c05350da30 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Mon May 10 14:44:19 2010 +0000
+++ b/libexec/httpd/bozohttpd.c Mon May 10 14:53:17 2010 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: bozohttpd.c,v 1.17 2010/05/10 14:44:19 mrg Exp $       */
+/*     $NetBSD: bozohttpd.c,v 1.18 2010/05/10 14:53:17 mrg Exp $       */
 
-/*     $eterna: bozohttpd.c,v 1.167 2010/05/10 14:36:37 mrg Exp $      */
+/*     $eterna: bozohttpd.c,v 1.168 2010/05/10 14:49:19 mrg Exp $      */
 
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
@@ -109,7 +109,7 @@
 #define INDEX_HTML             "index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE                "bozohttpd/20100509"
+#define SERVER_SOFTWARE                "bozohttpd/20100510"
 #endif
 #ifndef DIRECT_ACCESS_FILE
 #define DIRECT_ACCESS_FILE     ".bzdirect"