[GNUnet-SVN] r32946 - in libmicrohttpd/src: include microhttpd

[gnunet]

Author: Karlson2k
Date: 2014-04-07 22:26:20 +0200 (Mon, 07 Apr 2014)
New Revision: 32946

Modified:
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Updated doxygen for MHD_FEATURE with new option name, fixed check of 
initialisaion of ligcrypt < 1.6.0

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2014-04-07 20:05:02 UTC (rev 
32945)
+++ libmicrohttpd/src/include/microhttpd.h      2014-04-07 20:26:20 UTC (rev 
32946)
@@ -2375,9 +2375,9 @@
   /**
    * 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,
 

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2014-04-07 20:05:02 UTC (rev 
32945)
+++ libmicrohttpd/src/microhttpd/daemon.c       2014-04-07 20:26:20 UTC (rev 
32946)
@@ -4411,7 +4411,7 @@
 #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