 @@ -1,14 +1,14 @@
-.\"	$NetBSD: bozohttpd.8,v 1.5 2008/09/13 14:00:34 reed Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.6 2008/12/06 13:18:09 jnemeth Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.78 2008/03/03 03:36:11 mrg Exp $
 .\"
 .\" Copyright (c) 1997-2008 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -18,41 +18,42 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 3, 2008
+.Dd December 6, 2008
 .Dt HTTPD 8
 .Sh NAME
 .Nm httpd
 .Nd hyper text transfer protocol version 1.1 daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl HVXbenrus
 .Op Fl C Ar suffix cgihandler
 .Op Fl I Ar port
 .Op Fl M Ar suffix type encoding encoding11
 .Op Fl S Ar server_software
 .Op Fl c Ar cgibin
 .Op Fl i Ar address
 .Op Fl p Ar pubdir
 .Op Fl t Ar chrootdir
 .Op Fl v Ar virtualroot
 .Op Fl x Ar index
 .Op Fl Z Ar cert privkey
 .Ar slashdir
 .Op Ar myname
 .Sh DESCRIPTION
 The
 .Nm
 program reads a
 .Em HTTP
 request from the standard input, and sends a reply to the standard output.
 Besides ~user translation and virtual hosting support (see below), all file
 requests are from
 @@ -113,36 +114,38 @@ to not clear the environment when used w
 .Fl t
 or
 .Fl U
 options.
 .It Fl H
 This option causes directory index mode to hide files and directories
 that start with a period, except for
 .Pa .. .
 Also see
 .Fl X .
 .It Fl I Ar port
 This option is only valid with the
 .Fl b
-option.  It causes
+option.
 It causes
 .Ar port
 to use used as the port to bind daemon mode.
 The default is the
 .Dq http
 port.
 .It Fl i Ar address
 This option is only valid with the
 .Fl b
-option.  It causes
+option.
 It causes
 .Ar address
 to use used as the address to bind daemon mode.
 If otherwise unspecified, the address used to bind is derived from the
 .Ar myname ,
 which defaults to the name returned by
 .Xr gethostname 3 .
 .It Fl M Ar suffix type encoding encoding11
 This option adds a new entry to the table that converts file suffixes to
 content type and encoding.
 This option takes four additional arguments containing
 the file prefix, its
 .Dq Content-Type ,
 .Dq Content-Encoding
 @@ -243,27 +246,28 @@ See the
 section for an example of using this option.
 .It Fl X
 This option enables directory indexing.
 A directory index will be generated only when the default file (i.e.
 .Pa index.html
 normally) is not present.
 .It Fl x Ar index
 This option changes the default file read for directories from
 .Dq index.html
 to
 .Ar index .
 .It Fl Z Ar certificate_path privatekey_path
 This option sets the path to the server certificate file and the private key file
-in pem format.  It also causes
+in pem format.
 It also causes
 .Nm
 to start SSL mode.
 .El
 .Pp
 Note that in
 .Nm
 versions 20031005 and prior that supported the
 .Fl C
 and
 .Fl M
 options, they took a single space-separated argument that was parsed.
 since version 20040828, they take multiple options (2 in the case of
 .Fl C
 @@ -356,79 +360,81 @@ using the RFC 2617 HTTP
 .Dq Basic
 authentication scheme.
 .Pp
 Note:
 This does not recursively protect any sub-directories.
 .Pp
 The
 .Pa .htpasswd
 file contains lines delimited with a colon containing
 usernames and passwords hashed with
 .Xr crypt 3 ,
 for example:
 .Bd -literal
 heather:$1$pZWI4tH/$DzDPl63i6VvVRv2lJNV7k1
 jeremy:A.xewbx2DpQ8I
 .Ed
 .Pp
 On
 .Nx ,
 the
 .Xr pwhash 1
 utility may be used to generate hashed passwords.
 .Pp
 While
 .Nm
 distributed with
 .Nx
 has support for HTTP Basic Authorisation enabled by default,
 the portable distribution it is excluded.
 Compile
 .Nm
 with
 .Dq -DDO_HTPASSWD
-on the compiler command line to enable this support.  It may require
+on the compiler command line to enable this support.
 It may require
 linking with the crypt library, using
 .Dq -lcrypt .
 .Sh FILES
 .Nm
 looks for a couple of special files in directories that allow certain features
 to be provided on a per-directory basis.
 In addition to the
 .Pa .htpasswd
 used by HTTP basic authorisation,
 if a
 .Pa .bzdirect
 file is found (contents are irrelevant)
 .Nm
 will allow direct access even with the
 .Fl r
 option.
 If a
 .Pa .bzredirect
 symbolic link is found,
 .Nm
 will perform a smart redirect to the target of this symlink.
 The target is assumed to live on the same server.
 If a
 .Pa .bzabsredirect
 symbolic link is found,
 .Nm
 will redirect to the absolute url pointed to by this symlink.
 This is useful to redirect to different servers.
 .Sh SSL SUPPORT
 .Nm
 has support for SSLv2, SSLv3, and TLSv1 protocols that is included by
-default. It requires linking with the crypto and ssl library, using
+default.
 It requires linking with the crypto and ssl library, using
 .Dq -lcrypto -lssl .
 To disable SSL SUPPORT compile
 .Nm
 with
 .Dq -DNO_SSL_SUPPORT
 on the compiler command line.
 .Sh SEE ALSO
 .Xr inetd.conf 5 ,
 .Xr inetd 8
 .Sh HISTORY
 The
 .Nm
 program was first written in perl, based on another perl http server