qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-04 06:24:44 +03:00
Code

[package] uhttpd:

Browse Source 
- 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
This commit is contained in:
jow 2010-04-03 13:09:10 +00:00
parent 4d520b5eae
commit ac1453a896
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/uhttpd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

25
package/uhttpd/files/uhttpd.init
View File

@ -6,14 +6,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd"
PX5G_BIN="/usr/sbin/px5g" PX5G_BIN="/usr/sbin/px5g"
append_listen_http() {
append UHTTPD_ARGS "-p $1"
}
append_listen_https() {
append UHTTPD_ARGS "-s $1"
}
append_arg() { append_arg() {
local cfg="$1" local cfg="$1"
local var="$2" local var="$2"
@ -57,7 +49,7 @@ start_instance()
local cfg="$1" local cfg="$1"
local realm="$(uci get system.@system[0].hostname 2>/dev/null)" 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" home "-h"
append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
@ -67,14 +59,16 @@ start_instance()
append_arg "$cfg" lua_handler "-L" append_arg "$cfg" lua_handler "-L"
append_arg "$cfg" script_timeout "-t" append_arg "$cfg" script_timeout "-t"
config_list_foreach "$cfg" listen_http \ config_get http "$cfg" listen_http
append_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_KEY "$cfg" key /etc/uhttpd.key
config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
[ -n "$ssl" ] && { [ -n "$https" ] && {
[ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || {
config_foreach generate_keys cert config_foreach generate_keys cert
} }
@ -83,8 +77,9 @@ start_instance()
append_arg "$cfg" cert "-C" append_arg "$cfg" cert "-C"
append_arg "$cfg" key "-K" append_arg "$cfg" key "-K"
config_list_foreach "$cfg" listen_https \ for listen in $https; do
append_listen_https append UHTTPD_ARGS "-s $listen"
done
} }
} }

2
package/uhttpd/src/uhttpd.c
View File

@ -524,6 +524,7 @@ int main (int argc, char **argv)
port = optarg; port = optarg;
} }
#ifdef HAVE_TLS
if( opt == 's' ) if( opt == 's' )
{ {
if( !conf.tls ) if( !conf.tls )
@ -537,6 +538,7 @@ int main (int argc, char **argv)
tls = 1; tls = 1;
} }
#endif
/* bind sockets */ /* bind sockets */
bound += uh_socket_bind( bound += uh_socket_bind(