aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/src
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-04-03 13:09:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-04-03 13:09:10 +0000
commitd0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba (patch)
tree0a8e1f0be7c634c7106d02042770e43f390ee2d7 /package/uhttpd/src
parente8e70099ee73bb16847cf7b3b91db3b99ca42668 (diff)
downloadmaster-187ad058-d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba.tar.gz
master-187ad058-d0f557ddbf80e95756f5c7a3bebf39d0fa8bd5ba.tar.bz2
master-187ad058-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/uhttpd/src')
-rw-r--r--package/uhttpd/src/uhttpd.c2
1 files changed, 2 insertions, 0 deletions
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(