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

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.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 0565cd3a9c5aa640d430868f483e63276a7afd56..7e4db74966c2417011d9b7ee5b54d7a3d34864d2 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -6568,10 +6568,7 @@ out_uri_auth_compat:
                                        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)
                                listener->options |= LI_O_NOLINGER;
                        if (!listener->maxconn)

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 3c997eb53472964e9fe6ca1929a295b11c5edf21..4862a9a048701501475b3a66ce4f0e1163ddb156 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -863,7 +863,12 @@ static int bind_parse_psc(char **args, int cur_arg, struct proxy *px, struct bin
 /* parse the "ssl" bind keyword */
 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;
+       list_for_each_entry(l, &conf->listeners, by_bind)
+               l->data = &ssl_sock;
+
        return 0;
 }