uhttpd: do not configure TLS parameters if libustream-ssl is not present
A quite frequent problem after sysupgrading from an older, SSL enabled build is that ustream-ssl is not installed so uhttpd fails to come up again due to https listening directives in the preserved configuration. Skip key/cert and ssl listen options when libustream-ssl.so is not present. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42284 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
c3738b4413
commit
6894492f81
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2010-2013 Jo-Philipp Wich <jow@openwrt.org>
|
||||
# Copyright (C) 2010-2014 Jo-Philipp Wich <jow@openwrt.org>
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=uhttpd
|
||||
PKG_VERSION:=2014-06-11
|
||||
PKG_VERSION:=2014-08-25
|
||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
|
|
|
@ -109,7 +109,7 @@ start_instance()
|
|||
config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key
|
||||
config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
|
||||
|
||||
[ -n "$https" ] && {
|
||||
[ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && {
|
||||
[ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || {
|
||||
config_foreach generate_keys cert
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue