Module Name: src
Committed By: mrg
Date: Mon May 10 14:53:18 UTC 2010
Modified Files:
src/libexec/httpd: bozohttpd.8 bozohttpd.c
Log Message:
merge 20100510 properly
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/libexec/httpd/bozohttpd.8 \
src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.17 src/libexec/httpd/bozohttpd.8:1.18
--- src/libexec/httpd/bozohttpd.8:1.17 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/bozohttpd.8 Mon May 10 14:53:17 2010
@@ -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
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.17 src/libexec/httpd/bozohttpd.c:1.18
--- src/libexec/httpd/bozohttpd.c:1.17 Mon May 10 14:44:19 2010
+++ src/libexec/httpd/bozohttpd.c Mon May 10 14:53:17 2010
@@ -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"
