diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-04-07 20:26:20 +0000 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-04-07 20:26:20 +0000 |
| commit | c196047666c45da71db68f9beebbf605c2d47544 (patch) | |
| tree | 749a13e189f4be0bb14e2d891e01ac06842f2272 | |
| parent | f46a9bc5fb374691472c9a37af0db86b2575bc8b (diff) | |
| download | libmicrohttpd-c196047666c45da71db68f9beebbf605c2d47544.tar.gz libmicrohttpd-c196047666c45da71db68f9beebbf605c2d47544.zip | |
Updated doxygen for MHD_FEATURE with new option name, fixed check of initialisaion of ligcrypt < 1.6.0
| -rw-r--r-- | src/include/microhttpd.h | 6 | ||||
| -rw-r--r-- | 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 | |||
| 2375 | /** | 2375 | /** |
| 2376 | * Get whether HTTPS is supported. If supported then flag | 2376 | * Get whether HTTPS is supported. If supported then flag |
| 2377 | * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY, | 2377 | * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY, |
| 2378 | * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST | 2378 | * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST, |
| 2379 | * #MHD_OPTION_HTTPS_CRED_TYPE, #MHD_OPTION_HTTPS_PRIORITIES | 2379 | * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, |
| 2380 | * can be used. | 2380 | * #MHD_OPTION_HTTPS_PRIORITIES can be used. |
| 2381 | */ | 2381 | */ |
| 2382 | MHD_FEATURE_SSL = 2, | 2382 | MHD_FEATURE_SSL = 2, |
| 2383 | 2383 | ||
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) () | |||
| 4411 | #endif | 4411 | #endif |
| 4412 | #if HTTPS_SUPPORT | 4412 | #if HTTPS_SUPPORT |
| 4413 | #if GCRYPT_VERSION_NUMBER < 0x010600 | 4413 | #if GCRYPT_VERSION_NUMBER < 0x010600 |
| 4414 | if (!gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) | 4414 | if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) |
| 4415 | MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); | 4415 | MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); |
| 4416 | gcry_check_version (NULL); | 4416 | gcry_check_version (NULL); |
| 4417 | #else | 4417 | #else |