diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index b6906459..14cc0121 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -2678,7 +2678,7 @@ void | |||
2678 | MHD_resume_connection (struct MHD_Connection *connection) | 2678 | MHD_resume_connection (struct MHD_Connection *connection) |
2679 | { | 2679 | { |
2680 | struct MHD_Daemon *daemon = connection->daemon; | 2680 | struct MHD_Daemon *daemon = connection->daemon; |
2681 | 2681 | ||
2682 | if (0 == (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) | 2682 | if (0 == (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) |
2683 | MHD_PANIC (_("Cannot resume connections without enabling MHD_ALLOW_SUSPEND_RESUME!\n")); | 2683 | MHD_PANIC (_("Cannot resume connections without enabling MHD_ALLOW_SUSPEND_RESUME!\n")); |
2684 | MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); | 2684 | MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); |
@@ -2790,6 +2790,8 @@ resume_suspended_connections (struct MHD_Daemon *daemon) | |||
2790 | /* Data forwarding was finished (for TLS connections) AND | 2790 | /* Data forwarding was finished (for TLS connections) AND |
2791 | * application was closed upgraded connection. | 2791 | * application was closed upgraded connection. |
2792 | * Insert connection into cleanup list. */ | 2792 | * Insert connection into cleanup list. */ |
2793 | MHD_connection_close_ (pos, | ||
2794 | MHD_REQUEST_TERMINATED_COMPLETED_OK); | ||
2793 | DLL_insert (daemon->cleanup_head, | 2795 | DLL_insert (daemon->cleanup_head, |
2794 | daemon->cleanup_tail, | 2796 | daemon->cleanup_tail, |
2795 | pos); | 2797 | pos); |
@@ -5425,7 +5427,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5425 | MHD_DLOG (daemon, _("Using debug build of libmicrohttpd.\n") ); | 5427 | MHD_DLOG (daemon, _("Using debug build of libmicrohttpd.\n") ); |
5426 | #endif /* HAVE_MESSAGES */ | 5428 | #endif /* HAVE_MESSAGES */ |
5427 | #endif /* ! NDEBUG */ | 5429 | #endif /* ! NDEBUG */ |
5428 | 5430 | ||
5429 | if ( (0 != (*pflags & MHD_USE_ITC)) && | 5431 | if ( (0 != (*pflags & MHD_USE_ITC)) && |
5430 | (0 == daemon->worker_pool_size) ) | 5432 | (0 == daemon->worker_pool_size) ) |
5431 | { | 5433 | { |
@@ -5527,7 +5529,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5527 | { | 5529 | { |
5528 | /* try to open listen socket */ | 5530 | /* try to open listen socket */ |
5529 | int domain; | 5531 | int domain; |
5530 | 5532 | ||
5531 | #ifdef HAVE_INET6 | 5533 | #ifdef HAVE_INET6 |
5532 | domain = (*pflags & MHD_USE_IPv6) ? PF_INET6 : PF_INET; | 5534 | domain = (*pflags & MHD_USE_IPv6) ? PF_INET6 : PF_INET; |
5533 | #else /* ! HAVE_INET6 */ | 5535 | #else /* ! HAVE_INET6 */ |
@@ -5535,7 +5537,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5535 | goto free_and_fail; | 5537 | goto free_and_fail; |
5536 | domain = PF_INET; | 5538 | domain = PF_INET; |
5537 | #endif /* ! HAVE_INET6 */ | 5539 | #endif /* ! HAVE_INET6 */ |
5538 | 5540 | ||
5539 | listen_fd = MHD_socket_create_listen_(domain); | 5541 | listen_fd = MHD_socket_create_listen_(domain); |
5540 | if (MHD_INVALID_SOCKET == listen_fd) | 5542 | if (MHD_INVALID_SOCKET == listen_fd) |
5541 | { | 5543 | { |
@@ -6358,7 +6360,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon) | |||
6358 | #endif /* HAVE_LISTEN_SHUTDOWN */ | 6360 | #endif /* HAVE_LISTEN_SHUTDOWN */ |
6359 | mhd_assert (false); /* Should never happen */ | 6361 | mhd_assert (false); /* Should never happen */ |
6360 | } | 6362 | } |
6361 | 6363 | ||
6362 | if (! MHD_join_thread_ (daemon->pid.handle)) | 6364 | if (! MHD_join_thread_ (daemon->pid.handle)) |
6363 | { | 6365 | { |
6364 | MHD_PANIC (_("Failed to join a thread\n")); | 6366 | MHD_PANIC (_("Failed to join a thread\n")); |