diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-03 16:51:52 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-03 16:51:52 +0300 |
commit | 90086f053104e7072ad141fe5132cd6256e2227f (patch) | |
tree | a356b63dc03e3e8b7732b33239e648c303594ec4 | |
parent | 7055ebd931463d7bf0e4104c415d8ee60e21d83b (diff) | |
download | libmicrohttpd-90086f053104e7072ad141fe5132cd6256e2227f.tar.gz libmicrohttpd-90086f053104e7072ad141fe5132cd6256e2227f.zip |
Added MHD_FEATURE_TLS with as synonym for MHD_FEATURE_SSL.
-rw-r--r-- | src/include/microhttpd.h | 1 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index a441ee7a..76348978 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -2755,6 +2755,7 @@ enum MHD_FEATURE | |||
2755 | * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, | 2755 | * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, |
2756 | * #MHD_OPTION_HTTPS_PRIORITIES can be used. | 2756 | * #MHD_OPTION_HTTPS_PRIORITIES can be used. |
2757 | */ | 2757 | */ |
2758 | MHD_FEATURE_TLS = 2, | ||
2758 | MHD_FEATURE_SSL = 2, | 2759 | MHD_FEATURE_SSL = 2, |
2759 | 2760 | ||
2760 | /** | 2761 | /** |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 3c8a8e84..944b0384 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -5862,7 +5862,7 @@ MHD_is_feature_supported(enum MHD_FEATURE feature) | |||
5862 | #else | 5862 | #else |
5863 | return MHD_NO; | 5863 | return MHD_NO; |
5864 | #endif | 5864 | #endif |
5865 | case MHD_FEATURE_SSL: | 5865 | case MHD_FEATURE_TLS: |
5866 | #ifdef HTTPS_SUPPORT | 5866 | #ifdef HTTPS_SUPPORT |
5867 | return MHD_YES; | 5867 | return MHD_YES; |
5868 | #else /* ! HTTPS_SUPPORT */ | 5868 | #else /* ! HTTPS_SUPPORT */ |