diff options
author | ng0 <ng0@n0.is> | 2019-08-07 11:52:25 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-08-07 11:52:25 +0000 |
commit | 5a2872c15f0fd2ceebdb8b5f959021698ddb44f0 (patch) | |
tree | c57fe0a2a290869046b256af0ac80c6736df09d3 | |
parent | f8070814c6871bc50d7964a3c88d2a6c03be9c0e (diff) | |
parent | b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f (diff) | |
download | libmicrohttpd-5a2872c15f0fd2ceebdb8b5f959021698ddb44f0.tar.gz libmicrohttpd-5a2872c15f0fd2ceebdb8b5f959021698ddb44f0.zip |
Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019
-rw-r--r-- | src/microhttpd/daemon.c | 7 | ||||
-rw-r--r-- | 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 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, | |||
2536 | else | 2536 | else |
2537 | { | 2537 | { |
2538 | #ifdef HTTPS_SUPPORT | 2538 | #ifdef HTTPS_SUPPORT |
2539 | gnutls_init_flags_t flags; | 2539 | #if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) |
2540 | gnutls_init_flags_t | ||
2541 | #else | ||
2542 | unsigned int | ||
2543 | #endif | ||
2544 | flags; | ||
2540 | 2545 | ||
2541 | flags = GNUTLS_SERVER; | 2546 | flags = GNUTLS_SERVER; |
2542 | #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) | 2547 | #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 () | |||
581 | if (-1 != kicker[1]) | 581 | if (-1 != kicker[1]) |
582 | { | 582 | { |
583 | write (kicker[1], "K", 1); | 583 | write (kicker[1], "K", 1); |
584 | fprintf (stderr, "KICKING\n"); | ||
585 | } | 584 | } |
586 | } | 585 | } |
587 | 586 | ||