aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-09-02 13:28:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-09-02 13:28:29 +0000
commita672927900327b8381f8ef7f929d0ae5c3e19151 (patch)
tree93962e6d233fb5ff1533de217b465cd0026ffff7 /package/uhttpd
parent6922eff85b8124b17cb712f648078e38c92c82d9 (diff)
downloadupstream-a672927900327b8381f8ef7f929d0ae5c3e19151.tar.gz
upstream-a672927900327b8381f8ef7f929d0ae5c3e19151.tar.bz2
upstream-a672927900327b8381f8ef7f929d0ae5c3e19151.zip
[package] uhttpd: add "application/x-ns-proxy-autoconfig" mime type (#8236)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28149 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd')
-rw-r--r--package/uhttpd/Makefile2
-rw-r--r--package/uhttpd/src/uhttpd-mimetypes.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 17823ad16a..93ac8cf03e 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_RELEASE:=24
+PKG_RELEASE:=25
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \
diff --git a/package/uhttpd/src/uhttpd-mimetypes.h b/package/uhttpd/src/uhttpd-mimetypes.h
index 032d3d0c25..21717c0003 100644
--- a/package/uhttpd/src/uhttpd-mimetypes.h
+++ b/package/uhttpd/src/uhttpd-mimetypes.h
@@ -76,6 +76,9 @@ static struct mimetype uh_mime_types[] = {
{ "cfg", "text/plain" },
{ "conf", "text/plain" },
+ { "pac", "application/x-ns-proxy-autoconfig" },
+ { "wpad.dat", "application/x-ns-proxy-autoconfig" },
+
{ NULL, NULL }
};