Module Name: src
Committed By: msaitoh
Date: Sun Apr 19 04:44:03 UTC 2015
Modified Files:
src/libexec/httpd [netbsd-7]: CHANGES bozohttpd.8 bozohttpd.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #705):
libexec/httpd/CHANGES: revision 1.20
libexec/httpd/bozohttpd.8: revision 1.49
libexec/httpd/bozohttpd.c: revision 1.62-1.63
don't quote /. it doesn't work. this should fix PR#49765.
copyright maintenance, note shm@ in the manual and update the CHANGES
for recent changes. call this 20150320.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.46.4.1 -r1.46.4.2 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56.2.2 -r1.56.2.3 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.19 src/libexec/httpd/CHANGES:1.19.2.1
--- src/libexec/httpd/CHANGES:1.19 Thu Jul 17 10:21:51 2014
+++ src/libexec/httpd/CHANGES Sun Apr 19 04:44:03 2015
@@ -1,7 +1,12 @@
$eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
+changes in bozohttpd 20150320:
+ o fix redirection handling
+ o support transport stream (.ts) and video object (.vob) files
+ o directory listings show correct file sizes for large files
+
changes in bozohttpd 20140717:
- o properly handle SSL errors.
+ o properly handle SSL errors
changes in bozohttpd 20140708:
o fixes for virtual host support, from [email protected]
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.46.4.1 src/libexec/httpd/bozohttpd.8:1.46.4.2
--- src/libexec/httpd/bozohttpd.8:1.46.4.1 Mon Jan 12 10:02:29 2015
+++ src/libexec/httpd/bozohttpd.8 Sun Apr 19 04:44:03 2015
@@ -1,8 +1,8 @@
-.\" $NetBSD: bozohttpd.8,v 1.46.4.1 2015/01/12 10:02:29 martin Exp $
+.\" $NetBSD: bozohttpd.8,v 1.46.4.2 2015/04/19 04:44:03 msaitoh Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
-.\" Copyright (c) 1997-2014 Matthew R. Green
+.\" Copyright (c) 1997-2015 Matthew R. Green
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 25, 2014
+.Dd March 20, 2015
.Dt HTTPD 8
.Os
.Sh NAME
@@ -597,6 +597,11 @@ provided fixes for HTTP basic authorisat
.Aq Mt [email protected]
provided many fixes and enhancements for the man page
.It
+.An Mateusz Kocielski
+.Aq Mt [email protected]
+fixed memory leaks, information disclosure issues and added support
+for using CGI handlers with directory indexing.
+.It
.An Arnaud Lacombe
.Aq Mt [email protected]
provided some clean up for memory leaks
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.56.2.2 src/libexec/httpd/bozohttpd.c:1.56.2.3
--- src/libexec/httpd/bozohttpd.c:1.56.2.2 Wed Feb 4 10:17:19 2015
+++ src/libexec/httpd/bozohttpd.c Sun Apr 19 04:44:03 2015
@@ -1,9 +1,9 @@
-/* $NetBSD: bozohttpd.c,v 1.56.2.2 2015/02/04 10:17:19 martin Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.56.2.3 2015/04/19 04:44:03 msaitoh Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2014 Matthew R. Green
+ * Copyright (c) 1997-2015 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/20141225"
+#define SERVER_SOFTWARE "bozohttpd/20150320"
#endif
#ifndef DIRECT_ACCESS_FILE
#define DIRECT_ACCESS_FILE ".bzdirect"
@@ -878,7 +878,6 @@ bozo_escape_rfc3986(bozohttpd_t *httpd,
goto encode_it;
switch (*s) {
case ':':
- case '/':
case '?':
case '#':
case '[':
