diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-03 13:09:10 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-03 13:09:10 +0000 |
| commit | d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba (patch) | |
| tree | 0a8e1f0be7c634c7106d02042770e43f390ee2d7 /package | |
| parent | e8e70099ee73bb16847cf7b3b91db3b99ca42668 (diff) | |
| download | upstream-d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba.tar.gz upstream-d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba.tar.bz2 upstream-d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba.zip | |
[package] uhttpd:
- cope with options instead of lists in uci config
- fix compilation without tls (#7050)
- bump to rev 7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20668 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/uhttpd/Makefile | 2 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 25 | ||||
| -rw-r--r-- | package/uhttpd/src/uhttpd.c | 2 |
3 files changed, 13 insertions, 16 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile index 180e2284c3..6b4db3e15f 100644 --- a/package/uhttpd/Makefile +++ b/package/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init index ba7dd49fbd..4b747a0da1 100755 --- a/package/uhttpd/files/uhttpd.init +++ b/package/uhttpd/files/uhttpd.init @@ -6,14 +6,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd" PX5G_BIN="/usr/sbin/px5g" -append_listen_http() { - append UHTTPD_ARGS "-p $1" -} - -append_listen_https() { - append UHTTPD_ARGS "-s $1" -} - append_arg() { local cfg="$1" local var="$2" @@ -57,7 +49,7 @@ start_instance() local cfg="$1" local realm="$(uci get system.@system[0].hostname 2>/dev/null)" - local ssl + local listen http https append_arg "$cfg" home "-h" append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" @@ -67,14 +59,16 @@ start_instance() append_arg "$cfg" lua_handler "-L" append_arg "$cfg" script_timeout "-t" - config_list_foreach "$cfg" listen_http \ - append_listen_http + config_get http "$cfg" listen_http + for listen in $http; do + append UHTTPD_ARGS "-p $listen" + done - config_get ssl "$cfg" listen_https + config_get https "$cfg" listen_https config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt - [ -n "$ssl" ] && { + [ -n "$https" ] && { [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { config_foreach generate_keys cert } @@ -83,8 +77,9 @@ start_instance() append_arg "$cfg" cert "-C" append_arg "$cfg" key "-K" - config_list_foreach "$cfg" listen_https \ - append_listen_https + for listen in $https; do + append UHTTPD_ARGS "-s $listen" + done } } diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c index c6a8b6c272..da3779413e 100644 --- a/package/uhttpd/src/uhttpd.c +++ b/package/uhttpd/src/uhttpd.c @@ -524,6 +524,7 @@ int main (int argc, char **argv) port = optarg; } +#ifdef HAVE_TLS if( opt == 's' ) { if( !conf.tls ) @@ -537,6 +538,7 @@ int main (int argc, char **argv) tls = 1; } +#endif /* bind sockets */ bound += uh_socket_bind( |