Преглед на файлове

Updated doxygen for MHD_FEATURE with new option name, fixed check of initialisaion of ligcrypt < 1.6.0

Evgeny Grin (Karlson2k) преди 12 години
родител
ревизия
c196047666
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 3 3
      src/include/microhttpd.h
  2. 1 1
      src/microhttpd/daemon.c

+ 3 - 3
src/include/microhttpd.h

@@ -2375,9 +2375,9 @@ enum MHD_FEATURE
   /**
   /**
    * Get whether HTTPS is supported.  If supported then flag
    * Get whether HTTPS is supported.  If supported then flag
    * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY,
    * #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,
   MHD_FEATURE_SSL = 2,
 
 

+ 1 - 1
src/microhttpd/daemon.c

@@ -4411,7 +4411,7 @@ FUNC_CONSTRUCTOR (MHD_init) ()
 #endif
 #endif
 #if HTTPS_SUPPORT
 #if HTTPS_SUPPORT
 #if GCRYPT_VERSION_NUMBER < 0x010600
 #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");
     MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n");
   gcry_check_version (NULL);
   gcry_check_version (NULL);
 #else
 #else