mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-21 19:01:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: server: Make 'default-server' support 'verify' keyword.

Browse Source 
This patch makes 'default-server' directive support 'verify' keyword.
This commit is contained in:
Frdric Lcaille 2017-03-13 13:41:16 +01:00 committed by Willy Tarreau
parent 18388c910c
commit 7c8cd587c2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -1295,6 +1295,10 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
newsrv->dns_opts.pref_net_nb = curproxy->defsrv.dns_opts.pref_net_nb; newsrv->dns_opts.pref_net_nb = curproxy->defsrv.dns_opts.pref_net_nb;
newsrv->init_addr_methods = curproxy->defsrv.init_addr_methods; newsrv->init_addr_methods = curproxy->defsrv.init_addr_methods;
newsrv->init_addr = curproxy->defsrv.init_addr; newsrv->init_addr = curproxy->defsrv.init_addr;
#if defined(USE_OPENSSL)
/* SSL config. */
newsrv->ssl_ctx.verify = curproxy->defsrv.ssl_ctx.verify;
#endif
cur_arg = 3; cur_arg = 3;
} else { } else {

2
src/ssl_sock.c
View File

@ -7517,7 +7517,7 @@ static struct srv_kw_list srv_kws = { "SSL", { }, {
{ "tlsv11", srv_parse_tlsv11, 0, 1 }, /* enable TLSv11 */ { "tlsv11", srv_parse_tlsv11, 0, 1 }, /* enable TLSv11 */
{ "tlsv12", srv_parse_tlsv12, 0, 1 }, /* enable TLSv12 */ { "tlsv12", srv_parse_tlsv12, 0, 1 }, /* enable TLSv12 */
{ "tls-tickets", srv_parse_tls_tickets, 0, 1 }, /* enable session resumption tickets */ { "tls-tickets", srv_parse_tls_tickets, 0, 1 }, /* enable session resumption tickets */
{ "verify", srv_parse_verify, 1, 0 }, /* set SSL verify method */ { "verify", srv_parse_verify, 1, 1 }, /* set SSL verify method */
{ "verifyhost", srv_parse_verifyhost, 1, 0 }, /* require that SSL cert verifies for hostname */ { "verifyhost", srv_parse_verifyhost, 1, 0 }, /* require that SSL cert verifies for hostname */
{ NULL, NULL, 0, 0 }, { NULL, NULL, 0, 0 },
}}; }};