Module Name: src
Committed By: mrg
Date: Sat Feb 27 12:55:25 UTC 2021
Modified Files:
src/libexec/httpd: CHANGES bozohttpd.c content-bozo.c
Log Message:
changes in bozohttpd 20210227:
o new support for content types: .tar.bz2, .tar.xz, .tar.lz,
.tar.zst, .tbz2, .txz, .tlz, .zipx, .xz, .zst, .sz, .lz, .lzma,
.lzo, .7z, .lzo, .cab, .dmg, .jar, and .rar. should fix
netbsd PR#56026:
MIME type of .tar.xz file on ny{cdn,ftp}.NetBSD.org is invalid
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.127 -r1.128 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.19 -r1.20 src/libexec/httpd/content-bozo.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.46 src/libexec/httpd/CHANGES:1.47
--- src/libexec/httpd/CHANGES:1.46 Sat Feb 27 12:36:46 2021
+++ src/libexec/httpd/CHANGES Sat Feb 27 12:55:25 2021
@@ -1,4 +1,11 @@
-$NetBSD: CHANGES,v 1.46 2021/02/27 12:36:46 mrg Exp $
+$NetBSD: CHANGES,v 1.47 2021/02/27 12:55:25 mrg Exp $
+
+changes in bozohttpd 20210227:
+ o new support for content types: .tar.bz2, .tar.xz, .tar.lz,
+ .tar.zst, .tbz2, .txz, .tlz, .zipx, .xz, .zst, .sz, .lz, .lzma,
+ .lzo, .7z, .lzo, .cab, .dmg, .jar, and .rar. should fix
+ netbsd PR#56026:
+ MIME type of .tar.xz file on ny{cdn,ftp}.NetBSD.org is invalid
changes in bozohttpd 20210211:
o fix various NULL derefs from malformed headers. mostly from
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.127 src/libexec/httpd/bozohttpd.c:1.128
--- src/libexec/httpd/bozohttpd.c:1.127 Sat Feb 27 12:36:46 2021
+++ src/libexec/httpd/bozohttpd.c Sat Feb 27 12:55:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.127 2021/02/27 12:36:46 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.128 2021/02/27 12:55:25 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -108,7 +108,7 @@
#define INDEX_HTML "index.html"
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE "bozohttpd/20210211"
+#define SERVER_SOFTWARE "bozohttpd/20210227"
#endif
#ifndef PUBLIC_HTML
#define PUBLIC_HTML "public_html"
Index: src/libexec/httpd/content-bozo.c
diff -u src/libexec/httpd/content-bozo.c:1.19 src/libexec/httpd/content-bozo.c:1.20
--- src/libexec/httpd/content-bozo.c:1.19 Thu Oct 15 04:21:53 2020
+++ src/libexec/httpd/content-bozo.c Sat Feb 27 12:55:25 2021
@@ -1,9 +1,9 @@
-/* $NetBSD: content-bozo.c,v 1.19 2020/10/15 04:21:53 mrg Exp $ */
+/* $NetBSD: content-bozo.c,v 1.20 2021/02/27 12:55:25 mrg Exp $ */
/* $eterna: content-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
/*
- * Copyright (c) 1997-2020 Matthew R. Green
+ * Copyright (c) 1997-2021 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,11 +63,18 @@ static bozo_content_map_t static_content
{ ".pa", "application/x-ns-proxy-autoconfig", "", "", NULL },
{ ".tar", "multipart/x-tar", "", "", NULL },
{ ".gtar", "application/x-gtar-compressed", "", "", NULL },
- { ".tar.Z", "application/x-gtar-compressed", "", "", NULL },
{ ".tar.gz", "application/x-gtar-compressed", "", "", NULL },
- { ".taz", "application/x-gtar-compressed", "", "", NULL },
+ { ".tar.bz2", "application/x-gtar-compressed", "", "", NULL },
+ { ".tar.xz", "application/x-gtar-compressed", "", "", NULL },
+ { ".tar.lz", "application/x-gtar-compressed", "", "", NULL },
+ { ".tar.zst", "application/x-gtar-compressed", "", "", NULL },
{ ".tgz", "application/x-gtar-compressed", "", "", NULL },
+ { ".tbz2", "application/x-gtar-compressed", "", "", NULL },
+ { ".txz", "application/x-gtar-compressed", "", "", NULL },
+ { ".tlz", "application/x-gtar-compressed", "", "", NULL },
{ ".tar.z", "application/x-gtar-compressed", "", "", NULL },
+ { ".tar.Z", "application/x-gtar-compressed", "", "", NULL },
+ { ".taz", "application/x-gtar-compressed", "", "", NULL },
{ ".Z", "application/x-compress", "", "", NULL },
{ ".gz", "application/x-gzip", "", "", NULL },
{ ".z", "unknown", "", "", NULL },
@@ -131,6 +138,19 @@ static bozo_content_map_t static_content
{ ".ustar", "application/x-ustar", "", "", NULL },
{ ".src", "application/x-wais-source", "", "", NULL },
{ ".zip", "application/zip", "", "", NULL },
+ { ".zipx", "application/zip", "", "", NULL },
+ { ".xz", "application/x-xz", "", "", NULL },
+ { ".zst", "application/x-zstd", "", "", NULL },
+ { ".sz", "application/x-snappy-framed", "", "", NULL },
+ { ".lz", "application/x-lzip", "", "", NULL },
+ { ".lzma", "application/x-lzma", "", "", NULL },
+ { ".lzo", "application/x-lzop", "", "", NULL },
+ { ".7z", "application/x-7z-compressed", "", "", NULL },
+ { ".lzo", "application/x-lzop", "", "", NULL },
+ { ".cab", "application/vnd.ms-cab-compressed", "", "", NULL },
+ { ".dmg", "application/x-apple-diskimage","", "", NULL },
+ { ".jar", "application/java-archive", "", "", NULL },
+ { ".rar", "application/x-rar-compressed", "", "", NULL },
{ ".au", "audio/basic", "", "", NULL },
{ ".snd", "audio/basic", "", "", NULL },
{ ".mpga", "audio/mpeg", "", "", NULL },
