diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 6c7cc6382..70820bab4 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -213,7 +213,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (!last_defproxy) { /* we need a default proxy and none was created yet */ last_defproxy = alloc_new_proxy("", PR_CAP_DEF|PR_CAP_LISTEN, &errmsg); - proxy_preset_defaults(last_defproxy); curr_defproxy = last_defproxy; if (!last_defproxy) { diff --git a/src/hlua.c b/src/hlua.c index c5a1c615b..d1b28b939 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -13877,7 +13877,6 @@ void hlua_init(void) { fprintf(stderr, "Lua init: %s\n", errmsg); exit(1); } - proxy_preset_defaults(socket_proxy); /* Init TCP server: unchanged parameters */ socket_tcp = new_server(socket_proxy); diff --git a/src/http_client.c b/src/http_client.c index fca13a297..3e761b81a 100644 --- a/src/http_client.c +++ b/src/http_client.c @@ -1213,8 +1213,6 @@ struct proxy *httpclient_create_proxy(const char *id) goto err; } - proxy_preset_defaults(px); - px->options |= PR_O_WREQ_BODY; px->retry_type |= PR_RE_CONN_FAILED | PR_RE_DISCONNECTED | PR_RE_TIMEOUT; px->options2 |= PR_O2_INDEPSTR; diff --git a/src/proxy.c b/src/proxy.c index 544c22f82..f1b81f6f8 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -1430,6 +1430,9 @@ void init_new_proxy(struct proxy *p) p->extra_counters_be = NULL; HA_RWLOCK_INIT(&p->lock); + + /* initialize the default settings */ + proxy_preset_defaults(p); } /* Preset default settings onto proxy . */ @@ -1946,9 +1949,6 @@ struct proxy *parse_new_proxy(const char *name, unsigned int cap, return NULL; } } - else { - proxy_preset_defaults(curproxy); - } curproxy->conf.args.file = curproxy->conf.file = strdup(file); curproxy->conf.args.line = curproxy->conf.line = linenum;