From: Willy Tarreau <w@1wt.eu>
Date: Sun, 6 Jun 2010 13:51:11 +0000 (+0200)
Subject: [MINOR] config: initialize stick tables after all the parsing
X-Git-Tag: v1.5-dev8~563
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=056f5683e36e2b41b193f45fc538422961477c80;p=thirdparty%2Fhaproxy.git

[MINOR] config: initialize stick tables after all the parsing

We'll be able to add data types to stick tables while parsing their
users, so let's initialize them at the end.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index f534270859..26c8ba744a 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -5319,9 +5319,6 @@ out_uri_auth_compat:
 				curproxy->be_rsp_ana |= AN_RES_WAIT_HTTP | AN_RES_HTTP_PROCESS_BE;
 			}
 
-			/* init table on backend capabilities proxy */
-			stktable_init(&curproxy->table);
-
 			/* If the backend does requires RDP cookie persistence, we have to
 			 * enable the corresponding analyser.
 			 */
@@ -5467,6 +5464,14 @@ out_uri_auth_compat:
 
 	}
 
+	/* initialize stick-tables on backend capable proxies. This must not
+	 * be done earlier because the data size may be discovered while parsing
+	 * other proxies.
+	 */
+	for (curproxy = proxy; curproxy; curproxy = curproxy->next)
+		if (curproxy->cap & PR_CAP_BE)
+			stktable_init(&curproxy->table);
+
 	/*
 	 * Recount currently required checks.
 	 */