summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-08-07 11:52:25 +0000
committerng0 <ng0@n0.is>2019-08-07 11:52:25 +0000
commit5a2872c15f0fd2ceebdb8b5f959021698ddb44f0 (patch)
treec57fe0a2a290869046b256af0ac80c6736df09d3
parentf8070814c6871bc50d7964a3c88d2a6c03be9c0e (diff)
parentb84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f (diff)
Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019
-rw-r--r--src/microhttpd/daemon.c7
-rw-r--r--src/microhttpd/test_upgrade_large.c1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 16655f65..fb4abd5d 100644
--- 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
index fa7c0cb5..3131fdf4 100644
--- 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");
}
}