Merge pull request #200 from ejohnstown/master

Allow no SSL_CERTIFICATE when using init_ssl callback.

Merge pull request #200 from ejohnstown/master
Allow no SSL_CERTIFICATE when using init_ssl callback.
de774537 · Sergey Lyubka · 21786eec · 61f5f0b7 · de774537
Commit de774537 authored Jul 19, 2013 by Sergey Lyubka
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mongoose.c mongoose.c +4 -2

No files found.
--- a/mongoose.c
+++ b/mongoose.c
@@ -4741,8 +4741,10 @@ static int set_ssl_option(struct mg_context *ctx) {
  int i, size;
  const char *pem;

-  // If PEM file is not specified, skip SSL initialization.
-  if ((pem = ctx->config[SSL_CERTIFICATE]) == NULL) {
+  // If PEM file is not specified and the init_ssl callback
+  // is not specified, skip SSL initialization.
+  if ((pem = ctx->config[SSL_CERTIFICATE]) == NULL &&
+      ctx->callbacks.init_ssl == NULL) {
    return 1;
  }