From c2e50bf17e4256db6c7c555470bea255cdc6c5f1 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 2 Sep 2011 13:30:23 +0000
Subject: [PATCH] merge r28149

SVN-Revision: 28150
---
 package/uhttpd/Makefile               | 2 +-
 package/uhttpd/src/uhttpd-mimetypes.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 6e7ff8e107..7276b20190 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 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 }
 };
 
-- 
2.30.2