diff options
| author | John Crispin <john@openwrt.org> | 2015-10-19 10:08:01 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-10-19 10:08:01 +0000 |
| commit | 00df239f60681dfee3ee14992f437a756de62fd4 (patch) | |
| tree | b9010bbb9222758572b70b14af990733829969d0 /package/network/services/uhttpd | |
| parent | 7295e9fb8be958913764eea2e6c467464dba4c41 (diff) | |
| download | upstream-00df239f60681dfee3ee14992f437a756de62fd4.tar.gz upstream-00df239f60681dfee3ee14992f437a756de62fd4.tar.bz2 upstream-00df239f60681dfee3ee14992f437a756de62fd4.zip | |
uhttpd: update to latest git revision
adds URL alias support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 47206
Diffstat (limited to 'package/network/services/uhttpd')
| -rw-r--r-- | package/network/services/uhttpd/Makefile | 4 | ||||
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index a9a535aee8..253da44920 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-08 +PKG_VERSION:=2015-10-17 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:=7ed2edc40dd6d0171266f3bfbc96466e1d25e3cd +PKG_SOURCE_VERSION:=3614ae6eb7b6101fa5d0f14ff0d3a6eb4970c3da PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_LICENSE:=ISC diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index a3e09c44e7..fcde52a564 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -94,6 +94,11 @@ start_instance() append_bool "$cfg" no_dirlists "-D" 0 append_bool "$cfg" rfc1918_filter "-R" 0 + config_get alias_list "$cfg" alias + for alias in $alias_list; do + procd_append_param command -y "$alias" + done + config_get http "$cfg" listen_http for listen in $http; do procd_append_param command -p "$listen" |