diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-26 08:56:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-26 08:56:07 +0000 |
commit | 4152f010b2eab67d2f84c1dc69179d6aee6a507d (patch) | |
tree | 46cda1039d2ccaee9795d2b15062d1b8f3c6245a | |
parent | 947d67211183be0b9dc84b538bad0a49b67a717e (diff) | |
download | libmicrohttpd-4152f010b2eab67d2f84c1dc69179d6aee6a507d.tar.gz libmicrohttpd-4152f010b2eab67d2f84c1dc69179d6aee6a507d.zip |
Subject:
Problem using MHD_OPTION_HTTPS_MEM_DHPARAMS in MHD_OPTION_ARRAY
From:
Denis Dowling <Denis.Dowling@hsd.com.au>
Date:
02/26/2015 01:52 AM
To:
"libmicrohttpd@gnu.org" <libmicrohttpd@gnu.org>
Hi,
I was trying to add a Diffie Hellman key to the libmicrohttpd server using the MHD_OPTION_HTTPS_MEM_DHPARAMS option. I was putting this option into a vector and then passing this to MHD_start_daemon using the MHD_OPTION_ARRAY argument. This was failing and I tracked the problem down to a missing option in the switch statement in parse_options_va().
diff --git a/external/libmicrohttpd-0.9.39/src/microhttpd/daemon.c b/external/li
index 0816a4a..ce76a3b 100644
--- a/external/libmicrohttpd-0.9.39/src/microhttpd/daemon.c
+++ b/external/libmicrohttpd-0.9.39/src/microhttpd/daemon.c
@@ -3178,6 +3178,7 @@ parse_options_va (struct MHD_Daemon *daemon,
case MHD_OPTION_HTTPS_MEM_KEY:
case MHD_OPTION_HTTPS_MEM_CERT:
case MHD_OPTION_HTTPS_MEM_TRUST:
+ case MHD_OPTION_HTTPS_MEM_DHPARAMS:
case MHD_OPTION_HTTPS_PRIORITIES:
case MHD_OPTION_ARRAY:
case MHD_OPTION_HTTPS_CERT_CALLBACK:
Regards,
Denis
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,7 @@ | |||
1 | Thu Feb 26 09:55:43 CET 2015 | ||
2 | Fixing bug that prevented MHD_OPTION_HTTPS_MEM_DHPARAMS | ||
3 | from working within a MHD_OPTION_ARRAY. -DD | ||
4 | |||
1 | Sun Feb 8 01:24:38 CET 2015 | 5 | Sun Feb 8 01:24:38 CET 2015 |
2 | Adding MHD_OPTION_HTTPS_KEY_PASSWORD as proposed by | 6 | Adding MHD_OPTION_HTTPS_KEY_PASSWORD as proposed by |
3 | Andrew Basile. -CG/AB | 7 | Andrew Basile. -CG/AB |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index ba7ffd1d..314dabca 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -3221,6 +3221,7 @@ parse_options_va (struct MHD_Daemon *daemon, | |||
3221 | case MHD_OPTION_HTTPS_KEY_PASSWORD: | 3221 | case MHD_OPTION_HTTPS_KEY_PASSWORD: |
3222 | case MHD_OPTION_HTTPS_MEM_CERT: | 3222 | case MHD_OPTION_HTTPS_MEM_CERT: |
3223 | case MHD_OPTION_HTTPS_MEM_TRUST: | 3223 | case MHD_OPTION_HTTPS_MEM_TRUST: |
3224 | case MHD_OPTION_HTTPS_MEM_DHPARAMS: | ||
3224 | case MHD_OPTION_HTTPS_PRIORITIES: | 3225 | case MHD_OPTION_HTTPS_PRIORITIES: |
3225 | case MHD_OPTION_ARRAY: | 3226 | case MHD_OPTION_ARRAY: |
3226 | case MHD_OPTION_HTTPS_CERT_CALLBACK: | 3227 | case MHD_OPTION_HTTPS_CERT_CALLBACK: |