diff --git a/include/types/server.h b/include/types/server.h index 20c314b99..5092eb7df 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -249,8 +249,8 @@ struct server { struct sockaddr_storage init_addr; /* plain IP address specified on the init-addr line */ unsigned int init_addr_methods; /* initial address setting, 3-bit per method, ends at 0, enough to store 10 entries */ + int use_ssl; /* ssl enabled */ #ifdef USE_OPENSSL - int use_ssl; /* ssl enabled */ struct { SSL_CTX *ctx; SSL_SESSION *reused_sess; diff --git a/src/checks.c b/src/checks.c index b1e45499f..440ed605c 100644 --- a/src/checks.c +++ b/src/checks.c @@ -3427,9 +3427,7 @@ int srv_check_healthcheck_port(struct check *chk) * default, unless one is specified. */ if (!chk->port && !is_addr(&chk->addr)) { -#ifdef USE_OPENSSL chk->use_ssl |= (srv->use_ssl || (srv->proxy->options & PR_O_TCPCHK_SSL)); -#endif chk->send_proxy |= (srv->pp_opts); } diff --git a/src/server.c b/src/server.c index 479631c8e..b58216ecb 100644 --- a/src/server.c +++ b/src/server.c @@ -1072,6 +1072,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr goto out; } + newsrv->use_ssl = curproxy->defsrv.use_ssl; newsrv->check.use_ssl = curproxy->defsrv.check.use_ssl; newsrv->check.port = curproxy->defsrv.check.port; if (newsrv->check.port) @@ -1096,9 +1097,6 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr newsrv->onmarkedup = curproxy->defsrv.onmarkedup; newsrv->consecutive_errors_limit = curproxy->defsrv.consecutive_errors_limit; -#ifdef OPENSSL - newsrv->use_ssl = curproxy->defsrv.use_ssl; -#endif newsrv->uweight = newsrv->iweight = curproxy->defsrv.iweight;