From c196047666c45da71db68f9beebbf605c2d47544 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Mon, 7 Apr 2014 20:26:20 +0000 Subject: [PATCH] Updated doxygen for MHD_FEATURE with new option name, fixed check of initialisaion of ligcrypt < 1.6.0 --- src/include/microhttpd.h | 6 +++--- src/microhttpd/daemon.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index fefd1cb8..b5d6b054 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h @@ -2375,9 +2375,9 @@ enum MHD_FEATURE /** * Get whether HTTPS is supported. If supported then flag * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY, - * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST - * #MHD_OPTION_HTTPS_CRED_TYPE, #MHD_OPTION_HTTPS_PRIORITIES - * can be used. + * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST, + * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, + * #MHD_OPTION_HTTPS_PRIORITIES can be used. */ MHD_FEATURE_SSL = 2, diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index f3903804..82876d34 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -4411,7 +4411,7 @@ FUNC_CONSTRUCTOR (MHD_init) () #endif #if HTTPS_SUPPORT #if GCRYPT_VERSION_NUMBER < 0x010600 - if (!gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) + if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); gcry_check_version (NULL); #else