Module Name: src
Committed By: mrg
Date: Sun Feb 2 03:13:31 UTC 2014
Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c
Log Message:
update for 2014-02-01.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.43 -r1.44 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.46 -r1.47 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/CHANGES
diff -u src/libexec/httpd/CHANGES:1.14 src/libexec/httpd/CHANGES:1.15
--- src/libexec/httpd/CHANGES:1.14 Thu Jan 2 08:21:38 2014
+++ src/libexec/httpd/CHANGES Sun Feb 2 03:13:31 2014
@@ -1,6 +1,9 @@
$eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
-changes since bozohttpd 20111118:
+changes in bozohttpd 20140201:
+ o fix a core dump when requests timeout
+
+changes in bozohttpd 20140102:
o update a few content types
o add support for directly calling lua scripts to handle
processes, from mbal...@netbsd.org
@@ -10,7 +13,7 @@ changes since bozohttpd 20111118:
o add basic support for gzipped files, from el...@netbsd.org
o properly escape generated URIs
-changes since bozohttpd 20100920:
+changes in bozohttpd 20111118:
o add -P <pidfile> option, from j...@netbsd.org
o avoid crashes with http basic auth, from po...@netbsd.org
o add support for REDIRECT_STATUS variable, from t...@netbsd.org
@@ -19,7 +22,7 @@ changes since bozohttpd 20100920:
r...@netbsd.org
o allow -I option to be useful in non-inetd mode as well
-changes since bozohttpd 20100617:
+changes in bozohttpd 20100920:
o properly fully disable multi-file mode for now
o fix the -t and -U options when used without the -e option, broken since
the library-ifcation
@@ -30,7 +33,7 @@ changes since bozohttpd 20100617:
o fix some various non standard compile time errors, from rudolf
o fix dynamic CGI content maps, from rudolf
-changes since bozohttpd 20100509:
+changes in bozohttpd 20100617:
o fix some compile issues
o fix SSL mode. from rtr
o fix some cgi-bin issues, as seen with cvsweb
@@ -39,13 +42,13 @@ changes since bozohttpd 20100509:
o remove "noreturn" attribute from bozo_http_error() that was
causing incorrect runtime behaviour
-changes since bozohttpd 20090522:
+changes in bozohttpd 20100509:
o major rework and clean up of internal interfaces. move the main
program into main.c, the remaining parts are useable as library.
add bindings for lua. by Alistair G. Crooks <a...@netbsd.org>
o fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=566325
-changes since bozohttpd 20090417:
+changes in bozohttpd 20090522:
o avoid dying in daemon mode for some uncommon, but recoverable, errors
o close leaking file descriptors for CGI and daemon mode
o handle poll errors properly
@@ -56,7 +59,7 @@ changes since bozohttpd 20090417:
o document the -f option
o daemon mode now serves 6 files per child
-changes since bozohttpd 20080303:
+changes in bozohttpd 20090417:
o make bozohttpd internally more modular, preparing the way
to handle more than one request per process
o fix http-auth, set $REMOTE_USER not $REMOTEUSER. also fix
@@ -70,18 +73,18 @@ changes since bozohttpd 20080303:
<jo...@netbsd.org>
o many more manual fixes, from NetBSD
-changes since bozohttpd 20060710:
+changes in bozohttpd 20080303:
o fix some cgi header processing, from <thel...@gmail.com>
o add simple Range: header processing, from <b...@bsd.de>
o man page fixes, from NetBSD
o clean up various parts, from NetBSD
-changes since bozohttpd 20060517:
+changes in bozohttpd 20060710:
o prefix some function names with "bozo"
o align directory indexing <hr> markers
o clean up some code GCC4 grumbled about
-changes since bozohttpd 20050410:
+changes in bozohttpd 20060517:
o don't allow "/.." or "../" files
o don't write ":80" into urls for the http port
o fix a fd leak when fork() fails
@@ -89,7 +92,7 @@ changes since bozohttpd 20050410:
o build a text version of the manual page
o make "make clean" work properly
-changes since bozohttpd 20040808:
+changes in bozohttpd 20050410:
o fix some off-by-one errors from <roland.il...@gmx.de>
o properly support nph- CGI
o make content maps case insensitive
@@ -99,7 +102,7 @@ changes since bozohttpd 20040808:
from <rum...@ephemeral.org>
o HTTP/1.x protocol headers are now properly merged for CGI
-changes since bozohttpd 20040218:
+changes in bozohttpd 20040808:
o CGI status is now properly handled (-a flag has been removed)
o CGI file upload support works
o %xy translations are no longer ever applied after the first '?',
@@ -111,7 +114,7 @@ changes since bozohttpd 20040218:
o don't print 2 "200" headers for CGI
o support .torrent files
-changes since bozohttpd 20031005:
+changes in bozohttpd 20040218:
o new .bzredirect file support for sane directory redirection
o new -Z option that enables SSL mode, from <r...@eterna.com.au>
o the -C option has been changed to take two explicit options, rather
@@ -124,13 +127,13 @@ changes since bozohttpd 20031005:
o with -r, if a .bzdirect file appears in a directory, allow direct
access to this directory
-changes since bozohttpd 20030626:
+changes in bozohttpd 20031005:
o fixes for basic authorisation. from <e...@ipv42.net>
o always display file size in directory index mode
o add .xbel, .xml & .xsl -> text/xml mappings. from
<w...@danbala.ifoer.tuwien.ac.at>
-changes since bozohttpd 20030409:
+changes in bozohttpd 20030626:
o fix a recent core dump when given no input
o add new -r flag that ensures referrer is set to this host
o fix several compile time errors with -DNO_CGIBIN_SUPPORT
@@ -144,7 +147,7 @@ changes since bozohttpd 20030409:
o simplify some code in -C to avoid a core dump. from lukem
o add a .css -> css/text entry to the content_map[]. from z...@nox.cx
-changes since bozohttpd 20030313:
+changes in bozohttpd 20030409:
o -d without DEBUG enabled only prints one warning and continues
o one can now define the C macro SERVER_SOFTWARE when building to
change the Server: header and CGI variable of the same name
@@ -157,7 +160,7 @@ changes since bozohttpd 20030313:
o build on linux again
o fix core dumps when using -C
-changes since bozohttpd 20021106:
+changes in bozohttpd 20030313:
o deprecate -r flag; make this the default and silently ignore -r now
o add support for file extentions to call CGI programs (from lukem)
o add dynamic support to add new content map entries, allowing both
@@ -171,7 +174,7 @@ changes since bozohttpd 20021106:
o in -b mode, set the SO_REUSEADDR socket option (lukem)
o allow -x (index.html) mode to work with CGI handlers
-changes since bozohttpd 5.15 (20020913):
+changes in bozohttpd 20021106:
o add .bz2 support
o properly escape <, > and & in error messages, partly from
Nicolas Jombart <e...@mariejeanne.net>
@@ -180,11 +183,11 @@ changes since bozohttpd 5.15 (20020913):
overflowing the buffer with carriage returns (\r)
o do not decode "%XY"-style cgi-bin data beyond the "?"
-changes since bozohttpd 5.14 (20020823):
+changes in bozohttpd 5.15 (20020913):
o add .ogg support -> `application/x-ogg'
o fix CGI requests with "/" in the query part
-changes since bozohttpd 5.13 (20020804):
+changes in bozohttpd 5.14 (20020823):
o allow -X mode to work for "/"
o work on systems without MADV_SEQUENTIAL
o make a local cut-down copy of "queue.h" (fixes linux & solaris
@@ -193,15 +196,15 @@ changes since bozohttpd 5.13 (20020804):
o portability fixes for missing _PATH_DEFPATH, LOG_FTP and __progname
o better documentation on virtual host support
-changes since bozohttpd 5.12 (20020803):
+changes in bozohttpd 5.13 (20020804):
o support .mp3 files (type audio/mpeg)
o use stat() to find out if something is a directory, for -X mode
-changes since bozohttpd 5.11 (20020730):
+changes in bozohttpd 5.12 (20020803):
o constification
o fixes & enhancements for directory index mode (-X)
-changes since bozohttpd 5.10 (20020710):
+changes in bozohttpd 5.11 (20020730):
o more man page fixes from Thomas Klausner
<w...@danbala.ifoer.tuwien.ac.at>
o de-K&R C-ification
@@ -209,7 +212,7 @@ changes since bozohttpd 5.10 (20020710):
o fix core dump when asking for /cgi-bin/ when CGI isn't configured
o use a valid Server: header
-changes since bozohttpd 5.09 (20010922):
+changes in bozohttpd 5.10 (20020710):
- add freebsd support
- fix a couple of header typos
- many cgi-bin fixes from lu...@netbsd.org
@@ -218,41 +221,40 @@ changes since bozohttpd 5.09 (20010922):
- add -e that does not clear the environment for -T/-U
- fix a formatting error noticed by ISIHARA Takanori <is...@oak.dti.ne.jp>
-changes since bozohttpd 5.08 (20010812):
+changes in bozohttpd 5.09 (20010922):
- add a daemon mode
- document how to use bozohttpd in netbsd inetd with more than 40
connections per minute and also with cgibin
- man page fixes from w...@netbsd.org
-changes since bozohttpd 5.07 (20010610):
+changes in bozohttpd 5.08 (20010812):
- add directory index generation support (-X) from a...@netbsd.org
- add .pa as an alias for .pac
- make server software version configurable (RFC)
-changes since bozohttpd 5.06 (20000825):
+changes in bozohttpd 5.07 (20010610):
- add .png support
- new "-x index.html" flag to change default file
- new "-p public_html" flag to change default ~user directory
- fixes cgi-bin support and more from ch...@research.att.com
- add many new content-types, now support most common ones
-changes since bozohttpd 5.05 (20000815):
+changes in bozohttpd 5.06 (20000825):
- add IPv6 suppor from ito...@iijlab.net
- man page fixes from j...@netbsd.org
-changes since bozohttpd 5.04 (20000427):
+changes in bozohttpd 5.05 (20000815):
- fix a virtual host bug, from kle...@netbsd.org
-changes since bozohttpd 5.03 (20000427):
+changes in bozohttpd 5.04 (20000427):
- fix virtual host support; URI takes precedence over Host:
-changes since bozohttpd 5.02 (20000426):
+changes in bozohttpd 5.03 (20000427):
- fix a bug with chdir()
-changes since bozohttpd 5.01 (20000421):
+changes in bozohttpd 5.02 (20000426):
- .pac spport from simonb
-changes since bozohttpd 5.00 (19990519):
+changes in bozohttpd 5.01 (20000421):
- .swf support
- virtual hosting support
-
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.43 src/libexec/httpd/bozohttpd.8:1.44
--- src/libexec/httpd/bozohttpd.8:1.43 Thu Jan 2 08:47:38 2014
+++ src/libexec/httpd/bozohttpd.8 Sun Feb 2 03:13:31 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.43 2014/01/02 08:47:38 mrg Exp $
+.\" $NetBSD: bozohttpd.8,v 1.44 2014/02/02 03:13:31 mrg Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
@@ -511,7 +511,7 @@ The focus has always been simplicity and
and regular code audits.
This manual documents
.Nm
-version 20140102.
+version 20140201.
.Sh AUTHORS
.An -nosplit
.Nm
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.46 src/libexec/httpd/bozohttpd.c:1.47
--- src/libexec/httpd/bozohttpd.c:1.46 Thu Jan 30 02:51:41 2014
+++ src/libexec/httpd/bozohttpd.c Sun Feb 2 03:13:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.46 2014/01/30 02:51:41 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.47 2014/02/02 03:13:31 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -109,7 +109,7 @@
#define INDEX_HTML "index.html"
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE "bozohttpd/20140102"
+#define SERVER_SOFTWARE "bozohttpd/20140201"
#endif
#ifndef DIRECT_ACCESS_FILE
#define DIRECT_ACCESS_FILE ".bzdirect"
