Module Name: src
Committed By: mrg
Date: Fri Nov 18 09:51:31 UTC 2011
Modified Files:
src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.8 bozohttpd.c
bozohttpd.h cgi-bozo.c content-bozo.c daemon-bozo.c
dir-index-bozo.c main.c ssl-bozo.c tilde-luzah-bozo.c
src/libexec/httpd/testsuite: html_cmp
Removed Files:
src/libexec/httpd: bozohttpd.html8
Log Message:
merge bozohttpd 20111118
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.9 -r1.10 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.29 -r1.30 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.19 -r1.20 src/libexec/httpd/bozohttpd.h \
src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.1.1.1 -r0 src/libexec/httpd/bozohttpd.html8
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/content-bozo.c
cvs rdiff -u -r1.14 -r1.15 src/libexec/httpd/daemon-bozo.c
cvs rdiff -u -r1.12 -r1.13 src/libexec/httpd/dir-index-bozo.c \
src/libexec/httpd/ssl-bozo.c
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/main.c
cvs rdiff -u -r1.8 -r1.9 src/libexec/httpd/tilde-luzah-bozo.c
cvs rdiff -u -r1.3 -r1.4 src/libexec/httpd/testsuite/html_cmp
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.10 src/libexec/httpd/CHANGES:1.11
--- src/libexec/httpd/CHANGES:1.10 Mon Sep 20 23:11:38 2010
+++ src/libexec/httpd/CHANGES Fri Nov 18 09:51:31 2011
@@ -1,4 +1,13 @@
-$eterna: CHANGES,v 1.77 2010/09/20 22:26:28 mrg Exp $
+$eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
+
+changes since bozohttpd 20100920:
+ 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
+ o support .mp4 files in the default map
+ o directory indexes with files with : are now displayed properly, from
+ r...@netbsd.org
+ o allow -I option to be useful in non-inetd mode as well
changes since bozohttpd 20100617:
o properly fully disable multi-file mode for now
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.9 src/libexec/httpd/auth-bozo.c:1.10
--- src/libexec/httpd/auth-bozo.c:1.9 Mon May 10 14:44:19 2010
+++ src/libexec/httpd/auth-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: auth-bozo.c,v 1.9 2010/05/10 14:44:19 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.10 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: auth-bozo.c,v 1.16 2010/05/10 14:36:37 mrg Exp $ */
+/* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.31 src/libexec/httpd/bozohttpd.8:1.32
--- src/libexec/httpd/bozohttpd.8:1.31 Thu Nov 17 23:19:30 2011
+++ src/libexec/httpd/bozohttpd.8 Fri Nov 18 09:51:31 2011
@@ -1,6 +1,6 @@
-.\" $NetBSD: bozohttpd.8,v 1.31 2011/11/17 23:19:30 wiz Exp $
+.\" $NetBSD: bozohttpd.8,v 1.32 2011/11/18 09:51:31 mrg Exp $
.\"
-.\" $eterna: bozohttpd.8,v 1.99 2010/09/20 22:26:28 mrg Exp $
+.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
.\" Copyright (c) 1997-2010 Matthew R. Green
.\" All rights reserved.
@@ -34,19 +34,19 @@
.Nd hyper text transfer protocol version 1.1 daemon
.Sh SYNOPSIS
.Nm
-.Op Fl befHnrsuVX
+.Op Fl CIMPSZciptvx
.Op Fl C Ar suffix cgihandler
-.Op Fl c Ar cgibin
.Op Fl I Ar port
-.Op Fl i Ar address
.Op Fl M Ar suffix type encoding encoding11
.Op Fl P Ar pidfile
-.Op Fl p Ar pubdir
.Op Fl S Ar server_software
+.Op Fl Z Ar cert privkey
+.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
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.29 src/libexec/httpd/bozohttpd.c:1.30
--- src/libexec/httpd/bozohttpd.c:1.29 Thu Nov 17 22:09:12 2011
+++ src/libexec/httpd/bozohttpd.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: bozohttpd.c,v 1.29 2011/11/17 22:09:12 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.30 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: bozohttpd.c,v 1.176 2010/09/20 22:26:28 mrg Exp $ */
+/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@
#define INDEX_HTML "index.html"
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE "bozohttpd/20100920"
+#define SERVER_SOFTWARE "bozohttpd/20111118"
#endif
#ifndef DIRECT_ACCESS_FILE
#define DIRECT_ACCESS_FILE ".bzdirect"
Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.19 src/libexec/httpd/bozohttpd.h:1.20
--- src/libexec/httpd/bozohttpd.h:1.19 Sat Aug 27 15:33:59 2011
+++ src/libexec/httpd/bozohttpd.h Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: bozohttpd.h,v 1.19 2011/08/27 15:33:59 joerg Exp $ */
+/* $NetBSD: bozohttpd.h,v 1.20 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: bozohttpd.h,v 1.37 2010/09/20 22:26:28 mrg Exp $ */
+/* $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*
*/
-
#ifndef BOZOHTTOPD_H_
#define BOZOHTTOPD_H_ 1
@@ -197,10 +196,10 @@ char *bozostrdup(bozohttpd_t *, const ch
/* ssl-bozo.c */
#ifdef NO_SSL_SUPPORT
-#define bozo_ssl_set_opts(w, x, y) /* nothing */
-#define bozo_ssl_init(x) /* nothing */
-#define bozo_ssl_accept(x) /* nothing */
-#define bozo_ssl_destroy(x) /* nothing */
+#define bozo_ssl_set_opts(w, x, y) do { /* nothing */ } while (0)
+#define bozo_ssl_init(x) do { /* nothing */ } while (0)
+#define bozo_ssl_accept(x) do { /* nothing */ } while (0)
+#define bozo_ssl_destroy(x) do { /* nothing */ } while (0)
#else
void bozo_ssl_set_opts(bozohttpd_t *, const char *, const char *);
void bozo_ssl_init(bozohttpd_t *);
@@ -220,11 +219,11 @@ void bozo_auth_cgi_setenv(bozo_httpreq_t
int bozo_auth_cgi_count(bozo_httpreq_t *);
#else
#define bozo_auth_check(x, y) 0
-#define bozo_auth_cleanup(x) /* nothing */
+#define bozo_auth_cleanup(x) do { /* nothing */ } while (0)
#define bozo_auth_check_headers(y, z, a, b) 0
#define bozo_auth_check_special_files(x, y) 0
-#define bozo_auth_check_401(x, y) /* nothing */
-#define bozo_auth_cgi_setenv(x, y) /* nothing */
+#define bozo_auth_check_401(x, y) do { /* nothing */ } while (0)
+#define bozo_auth_cgi_setenv(x, y) do { /* nothing */ } while (0)
#define bozo_auth_cgi_count(x) 0
#endif /* DO_HTPASSWD */
@@ -242,9 +241,9 @@ void bozo_add_content_map_cgi(bozohttpd_
/* daemon-bozo.c */
#ifdef NO_DAEMON_MODE
-#define bozo_daemon_init(x) /* nothing */
+#define bozo_daemon_init(x) do { /* nothing */ } while (0)
#define bozo_daemon_fork(x) 0
-#define bozo_daemon_closefds(x) /* nothing */
+#define bozo_daemon_closefds(x) do { /* nothing */ } while (0)
#else
void bozo_daemon_init(bozohttpd_t *);
int bozo_daemon_fork(bozohttpd_t *);
Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.19 src/libexec/httpd/cgi-bozo.c:1.20
--- src/libexec/httpd/cgi-bozo.c:1.19 Tue Dec 14 13:27:39 2010
+++ src/libexec/httpd/cgi-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: cgi-bozo.c,v 1.19 2010/12/14 13:27:39 tls Exp $ */
+/* $NetBSD: cgi-bozo.c,v 1.20 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: cgi-bozo.c,v 1.38 2010/09/20 22:25:00 mrg Exp $ */
+/* $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/content-bozo.c
diff -u src/libexec/httpd/content-bozo.c:1.6 src/libexec/httpd/content-bozo.c:1.7
--- src/libexec/httpd/content-bozo.c:1.6 Thu Mar 31 01:19:37 2011
+++ src/libexec/httpd/content-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: content-bozo.c,v 1.6 2011/03/31 01:19:37 mrg Exp $ */
+/* $NetBSD: content-bozo.c,v 1.7 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: content-bozo.c,v 1.15 2010/05/10 02:51:28 mrg Exp $ */
+/* $eterna: content-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/daemon-bozo.c
diff -u src/libexec/httpd/daemon-bozo.c:1.14 src/libexec/httpd/daemon-bozo.c:1.15
--- src/libexec/httpd/daemon-bozo.c:1.14 Sat Aug 27 15:33:59 2011
+++ src/libexec/httpd/daemon-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: daemon-bozo.c,v 1.14 2011/08/27 15:33:59 joerg Exp $ */
+/* $NetBSD: daemon-bozo.c,v 1.15 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: daemon-bozo.c,v 1.22 2010/06/21 06:45:45 mrg Exp $ */
+/* $eterna: daemon-bozo.c,v 1.24 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.12 src/libexec/httpd/dir-index-bozo.c:1.13
--- src/libexec/httpd/dir-index-bozo.c:1.12 Thu Mar 10 14:39:40 2011
+++ src/libexec/httpd/dir-index-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: dir-index-bozo.c,v 1.12 2011/03/10 14:39:40 reed Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.13 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: dir-index-bozo.c,v 1.18 2010/09/20 22:26:29 mrg Exp $ */
+/* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.12 src/libexec/httpd/ssl-bozo.c:1.13
--- src/libexec/httpd/ssl-bozo.c:1.12 Sat Aug 27 15:33:59 2011
+++ src/libexec/httpd/ssl-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: ssl-bozo.c,v 1.12 2011/08/27 15:33:59 joerg Exp $ */
+/* $NetBSD: ssl-bozo.c,v 1.13 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: ssl-bozo.c,v 1.13 2010/05/12 12:24:58 rtr Exp $ */
+/* $eterna: ssl-bozo.c,v 1.15 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/main.c
diff -u src/libexec/httpd/main.c:1.4 src/libexec/httpd/main.c:1.5
--- src/libexec/httpd/main.c:1.4 Thu Nov 17 22:09:12 2011
+++ src/libexec/httpd/main.c Fri Nov 18 09:51:31 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: main.c,v 1.4 2011/11/17 22:09:12 mrg Exp $ */
+/* $NetBSD: main.c,v 1.5 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: main.c,v 1.4 2010/07/11 00:34:28 mrg Exp $ */
+/* $eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $ */
/* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,12 +79,12 @@ usage(bozohttpd_t *httpd, char *progname
bozo_warn(httpd,
" -c cgibin\t\tenable cgi-bin support in this directory");
#endif
+ bozo_warn(httpd, " -I port\t\tbind or use on this port");
#ifndef NO_DAEMON_MODE
bozo_warn(httpd, " -b\t\t\tbackground and go into daemon mode");
bozo_warn(httpd, " -f\t\t\tkeep daemon mode in the foreground");
bozo_warn(httpd,
" -i address\t\tbind on this address (daemon mode only)");
- bozo_warn(httpd, " -I port\t\tbind on this port (daemon mode only)");
bozo_warn(httpd, " -P pidfile\t\tpath to the pid file to create");
#endif
bozo_warn(httpd, " -S version\t\tset server version string");
Index: src/libexec/httpd/tilde-luzah-bozo.c
diff -u src/libexec/httpd/tilde-luzah-bozo.c:1.8 src/libexec/httpd/tilde-luzah-bozo.c:1.9
--- src/libexec/httpd/tilde-luzah-bozo.c:1.8 Thu Jun 17 19:43:30 2010
+++ src/libexec/httpd/tilde-luzah-bozo.c Fri Nov 18 09:51:31 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: tilde-luzah-bozo.c,v 1.8 2010/06/17 19:43:30 mrg Exp $ */
+/* $NetBSD: tilde-luzah-bozo.c,v 1.9 2011/11/18 09:51:31 mrg Exp $ */
-/* $eterna: tilde-luzah-bozo.c,v 1.15 2010/06/15 21:43:40 mrg Exp $ */
+/* $eterna: tilde-luzah-bozo.c,v 1.16 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2010 Matthew R. Green
+ * Copyright (c) 1997-2011 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/libexec/httpd/testsuite/html_cmp
diff -u src/libexec/httpd/testsuite/html_cmp:1.3 src/libexec/httpd/testsuite/html_cmp:1.4
--- src/libexec/httpd/testsuite/html_cmp:1.3 Sat Apr 18 07:48:02 2009
+++ src/libexec/httpd/testsuite/html_cmp Fri Nov 18 09:51:31 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $eterna: html_cmp,v 1.8 2003/02/06 09:40:39 mrg Exp $
+# $eterna: html_cmp,v 1.9 2011/11/17 22:18:02 mrg Exp $
#
# like cmp(1) but compares to files after making their `Date: ' headers
# the same, to allow `now' and `then' to work properly. it also tries
@@ -17,11 +17,11 @@ sedcmd="s/^Date: .*/Date: nowish/;
s/^Server: .*/^Server: bozotic HTTP server version 5.08/;
s/^Content-Length: .*/Content-Length: 223/;"
-sed -e "$sedcmd" < $1 > f1.tmp.$$
-sed -e "$sedcmd" < $2 > f2.tmp.$$
+sed -e "$sedcmd" < "$1" > "f1.tmp.$$"
+sed -e "$sedcmd" < "$2" > "f2.tmp.$$"
-cmp -s f1.tmp.$$ f2.tmp.$$
+cmp -s "f1.tmp.$$" "f2.tmp.$$"
rv=$?
-rm -f f1.tmp.$$ f2.tmp.$$
+rm -f "f1.tmp.$$" "f2.tmp.$$"
exit $rv
