aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-02-07 14:23:50 +0100
committerChristian Grothoff <christian@grothoff.org>2020-02-07 14:23:50 +0100
commit6da31a1c9f88710011b615c8efd0cf9895a45822 (patch)
tree1ce0cf323e4db26ed46c541041d144f229f49c39
parent94e8d665a1c1d84f1ea67f7e6499bd7b37cb2c46 (diff)
downloadlibmicrohttpd-6da31a1c9f88710011b615c8efd0cf9895a45822.tar.gz
libmicrohttpd-6da31a1c9f88710011b615c8efd0cf9895a45822.zip
fix #6036
-rw-r--r--src/microhttpd/daemon.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 516b432e..6ef007c2 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3131,6 +3131,7 @@ MHD_add_connection (struct MHD_Daemon *daemon,
3131{ 3131{
3132 bool sk_nonbl; 3132 bool sk_nonbl;
3133 3133
3134 MHD_cleanup_connections (daemon);
3134 if (! MHD_socket_nonblocking_ (client_socket)) 3135 if (! MHD_socket_nonblocking_ (client_socket))
3135 { 3136 {
3136#ifdef HAVE_MESSAGES 3137#ifdef HAVE_MESSAGES
@@ -4814,9 +4815,9 @@ unescape_wrapper (void *cls,
4814 * @param flags combination of `enum MHD_FLAG` values 4815 * @param flags combination of `enum MHD_FLAG` values
4815 * @param port port to bind to (in host byte order), 4816 * @param port port to bind to (in host byte order),
4816 * use '0' to bind to random free port, 4817 * use '0' to bind to random free port,
4817 * ignored if MHD_OPTION_SOCK_ADDR or 4818 * ignored if #MHD_OPTION_SOCK_ADDR or
4818 * MHD_OPTION_LISTEN_SOCKET is provided 4819 * #MHD_OPTION_LISTEN_SOCKET is provided
4819 * or MHD_USE_NO_LISTEN_SOCKET is specified 4820 * or #MHD_USE_NO_LISTEN_SOCKET is specified
4820 * @param apc callback to call to check which clients 4821 * @param apc callback to call to check which clients
4821 * will be allowed to connect; you can pass NULL 4822 * will be allowed to connect; you can pass NULL
4822 * in which case connections from any IP will be 4823 * in which case connections from any IP will be
@@ -5677,9 +5678,9 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
5677 * @param flags combination of `enum MHD_FLAG` values 5678 * @param flags combination of `enum MHD_FLAG` values
5678 * @param port port to bind to (in host byte order), 5679 * @param port port to bind to (in host byte order),
5679 * use '0' to bind to random free port, 5680 * use '0' to bind to random free port,
5680 * ignored if MHD_OPTION_SOCK_ADDR or 5681 * ignored if #MHD_OPTION_SOCK_ADDR or
5681 * MHD_OPTION_LISTEN_SOCKET is provided 5682 * #MHD_OPTION_LISTEN_SOCKET is provided
5682 * or MHD_USE_NO_LISTEN_SOCKET is specified 5683 * or #MHD_USE_NO_LISTEN_SOCKET is specified
5683 * @param apc callback to call to check which clients 5684 * @param apc callback to call to check which clients
5684 * will be allowed to connect; you can pass NULL 5685 * will be allowed to connect; you can pass NULL
5685 * in which case connections from any IP will be 5686 * in which case connections from any IP will be