From 75b6717d8b26159fb7dc20527507855a12dd0e96 Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Tue, 31 Aug 2010 11:58:45 +0200
Subject: [PATCH] wrapped set_ssl_option call into NO_SSL conditional. Fixed
 test.

---
 mongoose.c   | 6 ++++--
 test/test.pl | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoose.c b/mongoose.c
index 5b6b5137..a66ce4f2 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -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
diff --git a/test/test.pl b/test/test.pl
index 18bed826..999d5c54 100644
--- a/test/test.pl
+++ b/test/test.pl
@@ -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";