libmicrohttpd

commit 5a2872c15f0fd2ceebdb8b5f959021698ddb44f0
parent f8070814c6871bc50d7964a3c88d2a6c03be9c0e
Author: ng0 <ng0@n0.is>
Date:   Wed,  7 Aug 2019 11:52:25 +0000

Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019

Diffstat:
M
src/microhttpd/daemon.c
 | 
7
++++++-
M
src/microhttpd/test_upgrade_large.c
 | 
1
-

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon,
   else
     {
 #ifdef HTTPS_SUPPORT
-      gnutls_init_flags_t flags;
+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500)
+      gnutls_init_flags_t
+#else
+      unsigned int
+#endif
+        flags;
 
       flags = GNUTLS_SERVER;
 #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402)
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
@@ -581,7 +581,6 @@ kick_select ()
   if (-1 != kicker[1])
   {
     write (kicker[1], "K", 1);
-    fprintf (stderr, "KICKING\n");
   }
 }