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
commita0a640003469941c9067d8fab6e272a088aa45d8 (patch)
tree40c155f2b818a9f90f0e9468090dfc78aadef457 /package/uhttpd/src
parent90888d6b35e3253d2409ca974a7343c000fcf877 (diff)
downloadupstream-a0a640003469941c9067d8fab6e272a088aa45d8.tar.gz
upstream-a0a640003469941c9067d8fab6e272a088aa45d8.tar.bz2
upstream-a0a640003469941c9067d8fab6e272a088aa45d8.zip
uhttpd: - cope with options instead of lists in uci config - fix compilation without tls (#7050) - bump to rev 7
SVN-Revision: 20668
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(