3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-15 02:08:08 +08:00
Code Issues Projects Releases Wiki Activity

wrapped set_ssl_option call into NO_SSL conditional. Fixed test.

Browse Source
This commit is contained in:
Sergey Lyubka 2010-08-31 11:58:45 +02:00
parent 63af66c61f
commit 75b6717d8b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -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
// 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_gpass_option(ctx) ||
#if !defined(_WIN32)
!set_uid_option(ctx) ||
#endif

4
test/test.pl
View File

@ -385,9 +385,9 @@ sub do_PUT_test {
sub do_embedded_test {
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()) {
$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 ";
}
print $cmd, "\n";