- Fix detection of http listening port in fast_reload.

diff --git a/daemon/remote.c b/daemon/remote.c
index eccbe745f24c451ba216364e6366897054da228b..3984ef6e44cc24c32ed11cde5506f089b689340d 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -7798,7 +7798,9 @@ fr_worker_pickup_listen_dnsport(struct worker* worker)
                for(ll = front->cps; ll; ll = ll->next) {
                        struct comm_point* cp = ll->com;
                        if(cp->type == comm_tcp_accept &&
-                               cp->pp2_enabled /* true for http */) {
+                               cp->tcp_handlers &&
+                               cp->max_tcp_count > 0 &&
+                               cp->tcp_handlers[0]->type == comm_http) {
                                if(cp->ssl)
                                        cp->ssl = doh_sslctx;
                        } else if(cp->type == comm_tcp_accept) {
@@ -7905,8 +7907,8 @@ fast_reload_worker_pickup_changes(struct worker* worker)
 #ifdef USE_CACHEDB
        worker->env.cachedb_enabled = worker->daemon->env->cachedb_enabled;
 #endif
-       fr_worker_pickup_outside_network(worker);
        fr_worker_pickup_listen_dnsport(worker);
+       fr_worker_pickup_outside_network(worker);
 #ifdef USE_DNSTAP
        fr_worker_pickup_dnstap_changes(worker);
 #endif

diff --git a/doc/Changelog b/doc/Changelog
index f9b6df9677e9b6a9e64754aece0c1e6e5f5515cc..94f2eb53cc958778a20d7c1d04cfd146e7048776 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -11,6 +11,7 @@
        - For #278: fast_reload can reload tls-service-key, tls-service-pem
          and tls-cert-bundle changes. It checks the modification time of
          the tls-service-key and tls-service-pem files for update.
+       - Fix detection of http listening port in fast_reload.
 
 9 March 2026: Wouter
        - Fix compile failure in unbound-checkconf for older gcc compiler.