2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c5d3df0d..2766517b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 26 09:55:43 CET 2015
+        Fixing bug that prevented MHD_OPTION_HTTPS_MEM_DHPARAMS
+        from working within a MHD_OPTION_ARRAY. -DD
+
 Sun Feb  8 01:24:38 CET 2015
         Adding MHD_OPTION_HTTPS_KEY_PASSWORD as proposed by
         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,
                 case MHD_OPTION_HTTPS_KEY_PASSWORD:
                 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: