From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 2 Sep 2011 13:30:23 +0000 (+0000)
Subject: [backfire] merge r28149
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=7ef8101d588ff5569e9b80eac359bde9fbfcc8d3

[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 6e7ff8e10..7276b2019 100644
--- 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 032d3d0c2..21717c000 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 }
 };