[src/trunk]: src/libexec/httpd changes in bozohttpd 20210227:

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2daf4139c2fc
branches:  trunk
changeset: 953135:2daf4139c2fc
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Feb 27 12:55:25 2021 +0000

description:
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

diffstat:

 libexec/httpd/CHANGES        |   9 ++++++++-
 libexec/httpd/bozohttpd.c    |   4 ++--
 libexec/httpd/content-bozo.c |  30 +++++++++++++++++++++++++-----
 3 files changed, 35 insertions(+), 8 deletions(-)

diffs (91 lines):

diff -r 12812f0e99b1 -r 2daf4139c2fc libexec/httpd/CHANGES
--- a/libexec/httpd/CHANGES     Sat Feb 27 12:36:46 2021 +0000
+++ b/libexec/httpd/CHANGES     Sat Feb 27 12:55:25 2021 +0000
@@ -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
diff -r 12812f0e99b1 -r 2daf4139c2fc libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Sat Feb 27 12:36:46 2021 +0000
+++ b/libexec/httpd/bozohttpd.c Sat Feb 27 12:55:25 2021 +0000
@@ -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"
diff -r 12812f0e99b1 -r 2daf4139c2fc libexec/httpd/content-bozo.c
--- a/libexec/httpd/content-bozo.c      Sat Feb 27 12:36:46 2021 +0000
+++ b/libexec/httpd/content-bozo.c      Sat Feb 27 12:55:25 2021 +0000
@@ -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 @@
        { ".pa",        "application/x-ns-proxy-autoconfig", "",        "", NULL },
        { ".tar",       "multipart/x-tar",              "",             "", NULL },
        { ".gtar",      "application/x-gtar-compressed", "",            "", NULL },
+       { ".tar.gz",    "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 },
-       { ".tar.gz",    "application/x-gtar-compressed", "",            "", NULL },
        { ".taz",       "application/x-gtar-compressed", "",            "", NULL },
-       { ".tgz",       "application/x-gtar-compressed", "",            "", NULL },
-       { ".tar.z",     "application/x-gtar-compressed", "",            "", NULL },
        { ".Z",         "application/x-compress",       "",             "", NULL },
        { ".gz",        "application/x-gzip",           "",             "", NULL },
        { ".z",         "unknown",                      "",             "", NULL },
@@ -131,6 +138,19 @@
        { ".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 },