From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 11 Feb 2022 07:53:24 +0000 (+0100)
Subject: - Fix #624: Unable to stop Unbound in Windows console (does not
X-Git-Tag: release-1.16.0rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6b59fa474956584116f9525464edb7bfe88669;p=thirdparty%2Funbound.git

- Fix #624: Unable to stop Unbound in Windows console (does not
  respond to CTRL+C command).
---

diff --git a/daemon/worker.c b/daemon/worker.c
index 862affb24..aee308d7d 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1591,6 +1591,9 @@ worker_sighandler(int sig, void* arg)
 		case SIGHUP:
 			comm_base_exit(worker->base);
 			break;
+#endif
+#ifdef SIGBREAK
+		case SIGBREAK:
 #endif
 		case SIGINT:
 			worker->need_to_exit = 1;
@@ -1709,6 +1712,9 @@ worker_init(struct worker* worker, struct config_file *cfg,
 	if(do_sigs) {
 #ifdef SIGHUP
 		ub_thread_sig_unblock(SIGHUP);
+#endif
+#ifdef SIGBREAK
+		ub_thread_sig_unblock(SIGBREAK);
 #endif
 		ub_thread_sig_unblock(SIGINT);
 #ifdef SIGQUIT
@@ -1726,6 +1732,9 @@ worker_init(struct worker* worker, struct config_file *cfg,
 			|| !comm_signal_bind(worker->comsig, SIGQUIT)
 #endif
 			|| !comm_signal_bind(worker->comsig, SIGTERM)
+#ifdef SIGBREAK
+			|| !comm_signal_bind(worker->comsig, SIGBREAK)
+#endif
 			|| !comm_signal_bind(worker->comsig, SIGINT)) {
 			log_err("could not create signal handlers");
 			worker_delete(worker);
diff --git a/doc/Changelog b/doc/Changelog
index c93008363..abdf7c878 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+11 February 2022: Wouter
+	- Fix #624: Unable to stop Unbound in Windows console (does not
+	  respond to CTRL+C command).
+
 7 February 2022: Wouter
 	- Fix that TCP interface does not use TLS when TLS is also configured.