From 7fce085a9765cf41947515caead3100f7fab65e2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 2 Sep 2011 13:28:29 +0000
Subject: [PATCH] uhttpd: add "application/x-ns-proxy-autoconfig" mime type
 (#8236)

SVN-Revision: 28149
---
 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 17823ad16a8..93ac8cf03ea 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 032d3d0c25f..21717c00035 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 }
 };