diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-12-15 15:32:37 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-12-15 15:32:37 +0000 |
| commit | c5340d1dbf7299bbfa2d53128aeeadfb95b40abc (patch) | |
| tree | 990e03276ba533af518dc2bb0fb401e558fa4231 /package/network | |
| parent | c89198646e39a6c6237cd052d4500c7e666e8b26 (diff) | |
| download | master-187ad058-c5340d1dbf7299bbfa2d53128aeeadfb95b40abc.tar.gz master-187ad058-c5340d1dbf7299bbfa2d53128aeeadfb95b40abc.tar.bz2 master-187ad058-c5340d1dbf7299bbfa2d53128aeeadfb95b40abc.zip | |
uhttpd: don't process ubus_* and lua_* options if corresponding plugin is not installed (#14618)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39057 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 5b7686470b..9a76d8c1ff 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -67,10 +67,14 @@ start_instance() append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" append_arg "$cfg" config "-c" append_arg "$cfg" cgi_prefix "-x" - append_arg "$cfg" lua_prefix "-l" - append_arg "$cfg" lua_handler "-L" - append_arg "$cfg" ubus_prefix "-u" - append_arg "$cfg" ubus_socket "-U" + [ -f /usr/lib/uhttpd_lua.so ] && { + append_arg "$cfg" lua_prefix "-l" + append_arg "$cfg" lua_handler "-L" + } + [ -f /usr/lib/uhttpd_ubus.so ] && { + append_arg "$cfg" ubus_prefix "-u" + append_arg "$cfg" ubus_socket "-U" + } append_arg "$cfg" script_timeout "-t" append_arg "$cfg" network_timeout "-T" append_arg "$cfg" http_keepalive "-k" |