[GNUnet-SVN] r35301 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: grothoff
Date: 2015-02-26 09:56:07 +0100 (Thu, 26 Feb 2015)
New Revision: 35301

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Subject:
Problem using MHD_OPTION_HTTPS_MEM_DHPARAMS in MHD_OPTION_ARRAY
From:
Denis Dowling <address@hidden>
Date:
02/26/2015 01:52 AM
To:
"address@hidden" <address@hidden>

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


Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-02-23 23:48:36 UTC (rev 35300)
+++ libmicrohttpd/ChangeLog     2015-02-26 08:56:07 UTC (rev 35301)
@@ -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

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-02-23 23:48:36 UTC (rev 
35300)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-02-26 08:56:07 UTC (rev 
35301)
@@ -3221,6 +3221,7 @@
                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: