From cbe586a91926490315c183de105cba6ee4872d1e Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 15 Apr 2010 19:46:35 +0000
Subject: [package] uhttpd: 	- make network timeout configurable, increase
 default to 30 seconds (#7067) 	- follow symlinks in docroot and add option to
 disable that 	- fix mimetype detection for files with combined extensions
 (.tar.gz, ...)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20883 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/uhttpd/src/uhttpd-mimetypes.h | 97 ++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 47 deletions(-)

(limited to 'package/uhttpd/src/uhttpd-mimetypes.h')

diff --git a/package/uhttpd/src/uhttpd-mimetypes.h b/package/uhttpd/src/uhttpd-mimetypes.h
index 1c93f3113..032d3d0c2 100644
--- a/package/uhttpd/src/uhttpd-mimetypes.h
+++ b/package/uhttpd/src/uhttpd-mimetypes.h
@@ -20,58 +20,61 @@
 
 static struct mimetype uh_mime_types[] = {
 
-	{ "txt",    "text/plain" },
-	{ "log",    "text/plain" },
-	{ "js",     "text/javascript" },
-	{ "css",    "text/css" },
-	{ "htm",    "text/html" },
-	{ "html",   "text/html" },
-	{ "diff",   "text/x-patch" },
-	{ "patch",  "text/x-patch" },
-	{ "c",      "text/x-csrc" },
-	{ "h",      "text/x-chdr" },
-	{ "o",      "text/x-object" },
-	{ "ko",     "text/x-object" },
+	{ "txt",     "text/plain" },
+	{ "log",     "text/plain" },
+	{ "js",      "text/javascript" },
+	{ "css",     "text/css" },
+	{ "htm",     "text/html" },
+	{ "html",    "text/html" },
+	{ "diff",    "text/x-patch" },
+	{ "patch",   "text/x-patch" },
+	{ "c",       "text/x-csrc" },
+	{ "h",       "text/x-chdr" },
+	{ "o",       "text/x-object" },
+	{ "ko",      "text/x-object" },
 
-	{ "bmp",    "image/bmp" },
-	{ "gif",    "image/gif" },
-	{ "png",    "image/png" },
-	{ "jpg",    "image/jpeg" },
-	{ "jpeg",   "image/jpeg" },
-	{ "svg",    "image/svg+xml" },
+	{ "bmp",     "image/bmp" },
+	{ "gif",     "image/gif" },
+	{ "png",     "image/png" },
+	{ "jpg",     "image/jpeg" },
+	{ "jpeg",    "image/jpeg" },
+	{ "svg",     "image/svg+xml" },
 
-	{ "zip",    "application/zip" },
-	{ "pdf",    "application/pdf" },
-	{ "xml",    "application/xml" },
-	{ "xsl",    "application/xml" },
-	{ "doc",    "application/msword" },
-	{ "ppt",    "application/vnd.ms-powerpoint" },
-	{ "xls",    "application/vnd.ms-excel" },
-	{ "odt",    "application/vnd.oasis.opendocument.text" },
-	{ "odp",    "application/vnd.oasis.opendocument.presentation" },
-	{ "pl",     "application/x-perl" },
-	{ "sh",     "application/x-shellscript" },
-	{ "php",    "application/x-php" },
-	{ "deb",    "application/x-deb" },
-	{ "iso",    "application/x-cd-image" },
-	{ "tgz",    "application/x-compressed-tar" },
-	{ "gz",     "application/x-gzip" },
-	{ "bz2",    "application/x-bzip" },
-	{ "tar",    "application/x-tar" },
-	{ "rar",    "application/x-rar-compressed" },
+	{ "zip",     "application/zip" },
+	{ "pdf",     "application/pdf" },
+	{ "xml",     "application/xml" },
+	{ "xsl",     "application/xml" },
+	{ "doc",     "application/msword" },
+	{ "ppt",     "application/vnd.ms-powerpoint" },
+	{ "xls",     "application/vnd.ms-excel" },
+	{ "odt",     "application/vnd.oasis.opendocument.text" },
+	{ "odp",     "application/vnd.oasis.opendocument.presentation" },
+	{ "pl",      "application/x-perl" },
+	{ "sh",      "application/x-shellscript" },
+	{ "php",     "application/x-php" },
+	{ "deb",     "application/x-deb" },
+	{ "iso",     "application/x-cd-image" },
+	{ "tar.gz",  "application/x-compressed-tar" },
+	{ "tgz",     "application/x-compressed-tar" },
+	{ "gz",      "application/x-gzip" },
+	{ "tar.bz2", "application/x-bzip-compressed-tar" },
+	{ "tbz",     "application/x-bzip-compressed-tar" },
+	{ "bz2",     "application/x-bzip" },
+	{ "tar",     "application/x-tar" },
+	{ "rar",     "application/x-rar-compressed" },
 
-	{ "mp3",    "audio/mpeg" },
-	{ "ogg",    "audio/x-vorbis+ogg" },
-	{ "wav",    "audio/x-wav" },
+	{ "mp3",     "audio/mpeg" },
+	{ "ogg",     "audio/x-vorbis+ogg" },
+	{ "wav",     "audio/x-wav" },
 
-	{ "mpg",    "video/mpeg" },
-	{ "mpeg",   "video/mpeg" },
-	{ "avi",    "video/x-msvideo" },
+	{ "mpg",     "video/mpeg" },
+	{ "mpeg",    "video/mpeg" },
+	{ "avi",     "video/x-msvideo" },
 
-	{ "README", "text/plain" },
-	{ "log",    "text/plain" },
-	{ "cfg",    "text/plain" },
-	{ "conf",   "text/plain" },
+	{ "README",  "text/plain" },
+	{ "log",     "text/plain" },
+	{ "cfg",     "text/plain" },
+	{ "conf",    "text/plain" },
 
 	{ NULL, NULL }
 };
-- 
cgit v1.2.3