Merge branch 'artem-9_18-fix_isc__nm_sockstop' into 'bind-9.18'

Fix isc__nmsocket_stop(): make sockstop netievent as a high priority event (similarly to other transports)

See merge request isc-projects/bind9!7935

CHANGES

@@ -1,3 +1,7 @@
+6174.	[bug]		BIND could get stuck on reconfiguration when a
+			'listen' statement for HTTP is removed from the
+			configuration. That has been fixed. [GL #4071]
+
 6173.	[bug]		Properly process extra "nameserver" lines in
 			resolv.conf otherwise the next line is not properly
 			processed. [GL #4066]

doc/notes/notes-current.rst

@@ -35,7 +35,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- BIND could get stuck on reconfiguration when a `listen` statement
+  for HTTP is removed from the configuration. That has been fixed.
+  :gl:`#4071`
 
 Known Issues
 ~~~~~~~~~~~~

lib/isc/netmgr/netmgr-int.h

@@ -333,7 +333,6 @@ typedef enum isc__netievent_type {
 	netievent_privilegedtask,
 
 	netievent_settlsctx,
-	netievent_sockstop, /* for multilayer sockets */
 
 	/*
 	 * event type values higher than this will be treated
@@ -350,6 +349,7 @@ typedef enum isc__netievent_type {
 	netievent_tcpdnsstop,
 	netievent_tlsdnslisten,
 	netievent_tlsdnsstop,
+	netievent_sockstop, /* for multilayer sockets */
 
 	netievent_resume,
 	netievent_detach,

lib/isc/netmgr/netmgr.c

@@ -2756,7 +2756,7 @@ isc__nmsocket_stop(isc_nmsocket_t *listener) {
 	}
 
 	if (isc__nm_in_netthread()) {
-		isc__nm_async_sockstop(&listener->mgr->workers[0],
+		isc__nm_async_sockstop(&listener->mgr->workers[isc_nm_tid()],
 				       (isc__netievent_t *)&ievent);
 	}
 }