diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 8405aa56..014e35e1 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -5495,8 +5495,11 @@ close_all_connections (struct MHD_Daemon *daemon) | |||
5495 | if (NULL == susp->urh) /* "Upgraded" connection? */ | 5495 | if (NULL == susp->urh) /* "Upgraded" connection? */ |
5496 | MHD_PANIC (_("MHD_stop_daemon() called while we have suspended connections.\n")); | 5496 | MHD_PANIC (_("MHD_stop_daemon() called while we have suspended connections.\n")); |
5497 | #ifdef HTTPS_SUPPORT | 5497 | #ifdef HTTPS_SUPPORT |
5498 | else if (used_tls && used_thr_p_c && MHD_NO == susp->urh->clean_ready) | 5498 | else if (used_tls && |
5499 | shutdown (urh->app.socket, SHUT_RDWR); /* Wake thread by shutdown of app socket. */ | 5499 | used_thr_p_c && |
5500 | (MHD_NO == susp->urh->clean_ready) ) | ||
5501 | shutdown (urh->app.socket, | ||
5502 | SHUT_RDWR); /* Wake thread by shutdown of app socket. */ | ||
5500 | #endif /* HTTPS_SUPPORT */ | 5503 | #endif /* HTTPS_SUPPORT */ |
5501 | else | 5504 | else |
5502 | { | 5505 | { |
@@ -5508,7 +5511,7 @@ close_all_connections (struct MHD_Daemon *daemon) | |||
5508 | susp->urh->was_closed = MHD_YES; | 5511 | susp->urh->was_closed = MHD_YES; |
5509 | /* If thread-per-connection is used, connection's thread | 5512 | /* If thread-per-connection is used, connection's thread |
5510 | * may still processing "upgrade" (exiting). */ | 5513 | * may still processing "upgrade" (exiting). */ |
5511 | if (!used_thr_p_c) | 5514 | if (! used_thr_p_c) |
5512 | MHD_connection_finish_forward_ (susp); | 5515 | MHD_connection_finish_forward_ (susp); |
5513 | /* Do not use MHD_resume_connection() as mutex is | 5516 | /* Do not use MHD_resume_connection() as mutex is |
5514 | * already locked. */ | 5517 | * already locked. */ |