diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-18 12:39:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-18 12:39:06 +0000 |
| commit | e9751d56dcff9dbf6f282bad31d244ab4d2e831e (patch) | |
| tree | f8096efe172df0ae1dde5533dc1dfcc562d694e2 | |
| parent | 193b45229fd64c1bec5aece17b12efce35a7af49 (diff) | |
| download | upstream-e9751d56dcff9dbf6f282bad31d244ab4d2e831e.tar.gz upstream-e9751d56dcff9dbf6f282bad31d244ab4d2e831e.tar.bz2 upstream-e9751d56dcff9dbf6f282bad31d244ab4d2e831e.zip | |
uhttpd: update to the latest version, adds support for redirect helper scripts
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r47419
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47499 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/services/uhttpd/Makefile | 6 | ||||
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index d14e3a942e..f757696f64 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_VERSION:=2015-10-20 +PKG_VERSION:=2015-11-08 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=618315bc0729c3064e06af2900a86211354f81c9 +PKG_SOURCE_VERSION:=fe01ef3f52adae9da38ef47926cd50974af5d6b7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_LICENSE:=ISC @@ -33,7 +33,7 @@ endef define Package/uhttpd $(Package/uhttpd/default) - DEPENDS:=+libubox + DEPENDS:=+libubox +libblobmsg-json +libjson-script endef define Package/uhttpd/description diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 9bde7e5312..f4c49685ed 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -136,6 +136,10 @@ start_instance() append_bool "$cfg" redirect_https "-q" 0 } + for file in /etc/uhttpd/*.json; do + [ -s "$file" ] && procd_append_param command -H "$file" + done + procd_close_instance } |