Skip to content

M
mongoose
Commit de774537 authored by Sergey Lyubka's avatar Sergey Lyubka
Browse files
Options

Merge pull request #200 from ejohnstown/master 

Allow no SSL_CERTIFICATE when using init_ssl callback.
parents 21786eec 61f5f0b7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
mongoose.c
View file @ de774537
...@@ -4741,8 +4741,10 @@ static int set_ssl_option(struct mg_context *ctx) { ...@@ -4741,8 +4741,10 @@ static int set_ssl_option(struct mg_context *ctx) {
int i, size; int i, size;
const char *pem; const char *pem;
// If PEM file is not specified, skip SSL initialization. // If PEM file is not specified and the init_ssl callback
if ((pem = ctx->config[SSL_CERTIFICATE]) == NULL) { // is not specified, skip SSL initialization.
if ((pem = ctx->config[SSL_CERTIFICATE]) == NULL &&
ctx->callbacks.init_ssl == NULL) {
return 1; return 1;
} }
......
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