From: Willy Tarreau <w@1wt.eu>
Date: Wed, 10 Oct 2012 21:01:14 +0000 (+0200)
Subject: BUG/MEDIUM: config: check-send-proxy was ignored if SSL was not builtin
X-Git-Tag: v1.5-dev13~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7151633945a9b22a36ecee281bd8020b389a52f8;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: config: check-send-proxy was ignored if SSL was not builtin

Improper insertion within #if/#endif SSL causes the check-send-proxy state
not to be automatically enabled if SSL is disabled at build time.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 84988a66f3..1f7c479df7 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -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);