uhttpd: update to latest git head

	- introduces support for multiple index files
	- fixes build with only the TLS module selected

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33778 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index b2f0879..555d50c 100644 (file)
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd

-PKG_VERSION:=2012-10-15
+PKG_VERSION:=2012-10-15.2

 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/uhttpd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/uhttpd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_SOURCE_VERSION:=fa43d1a62864f912e4450affb9c86f3accbe026a
+PKG_SOURCE_VERSION:=d42932f9da6584c10d5d4bc7a41fa87817ac0677

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 379a9f5..ad46d2c 100755 (executable)
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -59,7 +59,7 @@ start_instance()
 
        local cfg="$1"
        local realm="$(uci_get system.@system[0].hostname)"
 
        local cfg="$1"
        local realm="$(uci_get system.@system[0].hostname)"

-       local listen http https interpreter path
+       local listen http https interpreter indexes path

 
        append_arg "$cfg" home "-h"
        append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
 
        append_arg "$cfg" home "-h"
        append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"


@@ -71,7 +71,6 @@ start_instance()
        append_arg "$cfg" network_timeout "-T"
        append_arg "$cfg" tcp_keepalive "-A"
        append_arg "$cfg" error_page "-E"
        append_arg "$cfg" network_timeout "-T"
        append_arg "$cfg" tcp_keepalive "-A"
        append_arg "$cfg" error_page "-E"

-       append_arg "$cfg" index_page "-I"

        append_arg "$cfg" max_requests "-n" 3
 
        append_bool "$cfg" no_symlinks "-S" 0
        append_arg "$cfg" max_requests "-n" 3
 
        append_bool "$cfg" no_symlinks "-S" 0


@@ -88,6 +87,11 @@ start_instance()
                append UHTTPD_ARGS "-i $path"
        done
 
                append UHTTPD_ARGS "-i $path"
        done
 

+       config_get indexes "$cfg" index_page
+       for path in $indexes; do
+               append UHTTPD_ARGS "-I $path"
+       done
+

        config_get https "$cfg" listen_https
        config_get UHTTPD_KEY  "$cfg" key  /etc/uhttpd.key
        config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
        config_get https "$cfg" listen_https
        config_get UHTTPD_KEY  "$cfg" key  /etc/uhttpd.key
        config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt