merge 20100510 properly

This commit is contained in:
mrg 2010-05-10 14:53:17 +00:00
parent a07e0db33b
commit d4586f7382
2 changed files with 7 additions and 6 deletions

View File

@ -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 @@ The focus has always been simplicity and security, with minimal features
and regular code audits.
This manual documents
.Nm
version 20090522.
version 20100510.
.Sh AUTHORS
.Nm
was written by Matthew R. Green

View File

@ -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"