aboutsummaryrefslogtreecommitdiffstats
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
commit7fce085a9765cf41947515caead3100f7fab65e2 (patch)
treeffec9a88add3ff30c6729139cd9b83744cee5c9b
parent995face56d5d8f701a505dd2ed9d827a69384675 (diff)
downloadupstream-7fce085a9765cf41947515caead3100f7fab65e2.tar.gz
upstream-7fce085a9765cf41947515caead3100f7fab65e2.tar.bz2
upstream-7fce085a9765cf41947515caead3100f7fab65e2.zip
uhttpd: add "application/x-ns-proxy-autoconfig" mime type (#8236)
SVN-Revision: 28149
-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 }
};