[backfire] merge r28149

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28150 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 6e7ff8e107827d626bf646119566eda890bf52e1..7276b2019001ea269d4b02fc2fd9fb31e00a5b8b 100644 (file)
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=23
+PKG_RELEASE:=23.1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := libcyassl liblua

diff --git a/package/uhttpd/src/uhttpd-mimetypes.h b/package/uhttpd/src/uhttpd-mimetypes.h
index 032d3d0c25f181410edd542162a1a32d7bf83c5a..21717c00035e7238ff38777334578563bf2e3a1f 100644 (file)
--- 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 }
 };