diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/microhttpd.h | 12 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index fc131f3f..a7e67df3 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t; | |||
130 | * Current version of the library. | 130 | * Current version of the library. |
131 | * 0x01093001 = 1.9.30-1. | 131 | * 0x01093001 = 1.9.30-1. |
132 | */ | 132 | */ |
133 | #define MHD_VERSION 0x00093905 | 133 | #define MHD_VERSION 0x00093906 |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * MHD-internal return code for "YES". | 136 | * MHD-internal return code for "YES". |
@@ -870,6 +870,7 @@ enum MHD_OPTION | |||
870 | * to be used by the HTTPS daemon. This option should be followed by a | 870 | * to be used by the HTTPS daemon. This option should be followed by a |
871 | * `const char *` argument. | 871 | * `const char *` argument. |
872 | * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. | 872 | * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. |
873 | * @sa ::MHD_FEATURE_HTTPS_KEY_PASSWORD | ||
873 | */ | 874 | */ |
874 | MHD_OPTION_HTTPS_KEY_PASSWORD = 26, | 875 | MHD_OPTION_HTTPS_KEY_PASSWORD = 26, |
875 | 876 | ||
@@ -2638,7 +2639,14 @@ enum MHD_FEATURE | |||
2638 | * #MHD_destroy_post_processor() can | 2639 | * #MHD_destroy_post_processor() can |
2639 | * be used. | 2640 | * be used. |
2640 | */ | 2641 | */ |
2641 | MHD_FEATURE_POSTPROCESSOR = 13 | 2642 | MHD_FEATURE_POSTPROCESSOR = 13, |
2643 | |||
2644 | /** | ||
2645 | * Get whether password encrypted private key for HTTPS daemon is | ||
2646 | * supported. If supported then option | ||
2647 | * ::MHD_OPTION_HTTPS_KEY_PASSWORD can be used. | ||
2648 | */ | ||
2649 | MHD_FEATURE_HTTPS_KEY_PASSWORD = 14 | ||
2642 | }; | 2650 | }; |
2643 | 2651 | ||
2644 | 2652 | ||
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 49bdc962..7f4449e5 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -4634,6 +4634,12 @@ MHD_is_feature_supported(enum MHD_FEATURE feature) | |||
4634 | #else | 4634 | #else |
4635 | return MHD_NO; | 4635 | return MHD_NO; |
4636 | #endif | 4636 | #endif |
4637 | case MHD_FEATURE_HTTPS_KEY_PASSWORD: | ||
4638 | #if HTTPS_SUPPORT && GNUTLS_VERSION_NUMBER >= 0x030100 | ||
4639 | return MHD_YES; | ||
4640 | #else | ||
4641 | return MHD_NO; | ||
4642 | #endif | ||
4637 | } | 4643 | } |
4638 | return MHD_NO; | 4644 | return MHD_NO; |
4639 | } | 4645 | } |