mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: set the listeners' data layer to ssl during parsing

Browse Source 
It's better to set all listeners to ssl_sock when seeing the "ssl"
keyword that to loop on all of them afterwards just for this. This
also removes some #ifdefs.
This commit is contained in:
Willy Tarreau 2012-09-22 19:11:47 +02:00
parent c53d42256d
commit 81796be87c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cfgparse.c
View File

@ -6568,10 +6568,7 @@ out_uri_auth_compat:
listener->name = strdup(trash); listener->name = strdup(trash);
} }
} }
#ifdef USE_OPENSSL
if (listener->bind_conf->is_ssl && listener->bind_conf->default_ctx)
listener->data = &ssl_sock; /* SSL data layer */
#endif
if (curproxy->options & PR_O_TCP_NOLING) if (curproxy->options & PR_O_TCP_NOLING)
listener->options |= LI_O_NOLINGER; listener->options |= LI_O_NOLINGER;
if (!listener->maxconn) if (!listener->maxconn)

5
src/ssl_sock.c
View File

@ -863,7 +863,12 @@ static int bind_parse_psc(char **args, int cur_arg, struct proxy *px, struct bin
/* parse the "ssl" bind keyword */ /* parse the "ssl" bind keyword */
static int bind_parse_ssl(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err) static int bind_parse_ssl(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
{ {
struct listener *l;
conf->is_ssl = 1; conf->is_ssl = 1;
list_for_each_entry(l, &conf->listeners, by_bind)
l->data = &ssl_sock;
return 0; return 0;
} }