Commit 75b6717d authored by Sergey Lyubka's avatar Sergey Lyubka

wrapped set_ssl_option call into NO_SSL conditional. Fixed test.

parent 63af66c6
...@@ -3853,9 +3853,11 @@ struct mg_context *mg_start(mg_callback_t user_callback, const char **options) { ...@@ -3853,9 +3853,11 @@ struct mg_context *mg_start(mg_callback_t user_callback, const char **options) {
// NOTE(lsm): order is important here. SSL certificates must // NOTE(lsm): order is important here. SSL certificates must
// be initialized before listening ports. UID must be set last. // be initialized before listening ports. UID must be set last.
if (!set_ssl_option(ctx) || if (!set_gpass_option(ctx) ||
#if !defined(NO_SSL)
!set_ssl_option(ctx) ||
#endif
!set_ports_option(ctx) || !set_ports_option(ctx) ||
!set_gpass_option(ctx) ||
#if !defined(_WIN32) #if !defined(_WIN32)
!set_uid_option(ctx) || !set_uid_option(ctx) ||
#endif #endif
......
...@@ -385,9 +385,9 @@ sub do_PUT_test { ...@@ -385,9 +385,9 @@ sub do_PUT_test {
sub do_embedded_test { sub do_embedded_test {
my $cmd = "cc -W -Wall -o $embed_exe $root/embed.c mongoose.c -I. ". my $cmd = "cc -W -Wall -o $embed_exe $root/embed.c mongoose.c -I. ".
"-pthread -DLISTENING_PORT=\\\"$port\\\""; "-pthread -DNO_SSL -DLISTENING_PORT=\\\"$port\\\"";
if (on_windows()) { if (on_windows()) {
$cmd = "cl $root/embed.c mongoose.c /I. /nologo ". $cmd = "cl $root/embed.c mongoose.c /I. /nologo /DNO_SSL ".
"/DLISTENING_PORT=\\\"$port\\\" /link /out:$embed_exe.exe ws2_32.lib "; "/DLISTENING_PORT=\\\"$port\\\" /link /out:$embed_exe.exe ws2_32.lib ";
} }
print $cmd, "\n"; print $cmd, "\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment