From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 9 Jul 2026 10:00:07 +0000 (+0200)
Subject: MINOR: server: set default-server id to NULL
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1183ca1114716111683a108e3da31a87c8bf2fa5;p=thirdparty%2Fhaproxy.git

MINOR: server: set default-server id to NULL

Previously, default-server <id> was set to "default-server" static
string. With this patch, it is now set to NULL.

This has no noticeable impact, including on the configuration error
messages, as default-server ID is not used there. This is because
register_parsing_obj() is only used for standard server and
server-template instances, but not for default-server.

A nice side-effect of this change is that it's possible to free server
<id> member in srv_free_params(), which is less error prone (even more
with named default server future implementation).

This is a prealable for the future named default-server feature, as it
could conflict with a default-server explicitely named "default-server".
Also, for named default-server, it will be necessary to free <id>
member. Thus it's better to remove a static string reference to prevent
any issue with free() usage.
---

diff --git a/src/proxy.c b/src/proxy.c
index 9c80a636f..ce4f7032d 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -3321,7 +3321,7 @@ static int proxy_defproxy_cpy(struct proxy *curproxy, const struct proxy *defpro
 				return 1;
 			}
 
-			curproxy->defsrv->id = "default-server";
+			curproxy->defsrv->id = NULL;
 			srv_settings_init(curproxy->defsrv);
 		}
 		srv_settings_cpy(curproxy->defsrv, defproxy->defsrv, 0);
diff --git a/src/server.c b/src/server.c
index 573f65256..bea64e74b 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3212,6 +3212,7 @@ void srv_free_params(struct server *srv)
 {
 	struct srv_pp_tlv_list *srv_tlv = NULL;
 
+	free(srv->id);
 	free(srv->cookie);
 	free(srv->rdr_pfx);
 	free(srv->hostname);
@@ -3290,8 +3291,6 @@ void srv_drop(struct server *srv)
 	task_destroy(srv->warmup);
 	task_destroy(srv->srvrq_check);
 
-	free(srv->id);
-
 #ifdef USE_QUIC
 	if (srv->per_thr) {
 		for (i = 0; i < global.nbthread; i++)
@@ -3906,7 +3905,7 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg,
 				err_code |= ERR_ALERT | ERR_ABORT;
 				goto out;
 			}
-			newsrv->id = "default-server";
+			newsrv->id = NULL;
 			srv_settings_init(newsrv);
 			curproxy->defsrv = newsrv;
 		}