]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: config: check-send-proxy was ignored if SSL was not builtin
authorWilly Tarreau <w@1wt.eu>
Wed, 10 Oct 2012 21:01:14 +0000 (23:01 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 10 Oct 2012 21:01:14 +0000 (23:01 +0200)
Improper insertion within #if/#endif SSL causes the check-send-proxy state
not to be automatically enabled if SSL is disabled at build time.

src/cfgparse.c

index 84988a66f39a74566d64eaff7d3f34fe94656ebb..1f7c479df77046081f65bdea90d215f1e71f0bbf 100644 (file)
@@ -4696,12 +4696,12 @@ stats_error_parsing:
                         * same as for the production traffic. Otherwise we use raw_sock by
                         * default, unless one is specified.
                         */
-#ifdef USE_OPENSSL
                        if (!newsrv->check.port && !is_addr(&newsrv->check.addr)) {
+#ifdef USE_OPENSSL
                                newsrv->check.use_ssl |= newsrv->use_ssl;
+#endif
                                newsrv->check.send_proxy |= (newsrv->state & SRV_SEND_PROXY);
                        }
-#endif
                        /* try to get the port from check.addr if check.port not set */
                        if (!newsrv->check.port)
                                newsrv->check.port = get_host_port(&newsrv->check.addr);