upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix windows compile for libunbound subprocess reap comm point closes.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2023-01-02 13:06:39 +01:00
parent 0682d4371e
commit 1224cd9d25
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
2 January 2023: Wouter
- Fix windows compile for libunbound subprocess reap comm point closes.
14 December 2022: George 14 December 2022: George
- Merge #569 from JINMEI Tatuya: add keep-cache option to - Merge #569 from JINMEI Tatuya: add keep-cache option to
'unbound-control reload' to keep caches. 'unbound-control reload' to keep caches.

2
libunbound/libunbound.c
View file

@ -311,6 +311,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
* it and only one should clean up, the one with getpid == pipe_pid.*/ * it and only one should clean up, the one with getpid == pipe_pid.*/
if(ctx->created_bg && ctx->pipe_pid != getpid()) { if(ctx->created_bg && ctx->pipe_pid != getpid()) {
do_stop = 0; do_stop = 0;
#ifndef USE_WINSOCK
/* Stop events from getting deregistered, if the backend is /* Stop events from getting deregistered, if the backend is
* epoll, the epoll fd is the same as the other process. * epoll, the epoll fd is the same as the other process.
* That process should deregister them. */ * That process should deregister them. */
@ -322,6 +323,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
ctx->rr_pipe->listen_com->event_added = 0; ctx->rr_pipe->listen_com->event_added = 0;
if(ctx->rr_pipe->res_com) if(ctx->rr_pipe->res_com)
ctx->rr_pipe->res_com->event_added = 0; ctx->rr_pipe->res_com->event_added = 0;
#endif
} }
/* see if bg thread is created and if threads have been killed */ /* see if bg thread is created and if threads have been killed */
/* no locks, because those may be held by terminated threads */ /* no locks, because those may be held by terminated threads */