Module Name:    src
Committed By:   dholland
Date:           Sun Jan 27 04:40:57 UTC 2019

Modified Files:
        src/libexec/httpd: CHANGES

Log Message:
fix duplicated chunk from merge


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/libexec/httpd/CHANGES

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.38 src/libexec/httpd/CHANGES:1.39
--- src/libexec/httpd/CHANGES:1.38	Sun Jan 27 02:08:36 2019
+++ src/libexec/httpd/CHANGES	Sun Jan 27 04:40:57 2019
@@ -1,37 +1,4 @@
-$NetBSD: CHANGES,v 1.38 2019/01/27 02:08:36 pgoyette Exp $
-
-changes in bozohttpd 20190121:
-	o  don't display special files in the directory index.  they aren't
-	   served, but links to them are generated.
-
-changes in bozohttpd 20190116:
-	o  fix CGI '+' parameter handling, some error checking, and a double
-	   free.  from rajeev_v_pil...@yahoo.com
-	o  more directory indexing clean up.  from rajeev_v_pil...@yahoo.com
-
-changes in bozohttpd 20181215:
-	o  fix .htpasswd bypass for authenticated users.  reported by JP,
-	   from l...@netbsd.org
-	o  avoid possible null dereference when receiving a big request that
-	   timeout.  reported by m...@netbsd.org, from l...@netbsd.org
-	o  fix handling of -T option, from l...@netbsd.org
-	o  cleanups and portability improvements, from m...@netbsd.org
-	o  change directory indexing to use html tables, from
-	   rajeev_v_pil...@yahoo.com
-
-changes in bozohttpd 20181125:
-	o  fixes for option parsing introduced in bozohttpd 20181123
-
-changes in bozohttpd 20181121:
-	o  add url remap support via .bzremap file, from mar...@netbsd.org
-	o  handle redirections for any protocol, not just http:
-	o  fix a denial of service attack against header contents, which
-	   is now bounded at 16KiB.  reported by JP
-	o  reduce default timeouts, and add expand timeouts to handle the
-	   initial line, each header, and the total time spent
-	o  add -T option to expose new timeout settings
-	o  minor RFC fixes related to timeout handling
-	o  fix special file (.htpasswd, .bz*) bypass.  reported by JP
+$NetBSD: CHANGES,v 1.39 2019/01/27 04:40:57 dholland Exp $
 
 changes in bozohttpd 20190121:
 	o  don't display special files in the directory index.  they aren't

Reply via email to