]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] config: initialize stick tables after all the parsing
authorWilly Tarreau <w@1wt.eu>
Sun, 6 Jun 2010 13:51:11 +0000 (15:51 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 14 Jun 2010 13:10:24 +0000 (15:10 +0200)
We'll be able to add data types to stick tables while parsing their
users, so let's initialize them at the end.

src/cfgparse.c

index f534270859cc38d554df9523b85e5d5f7f52bdff..26c8ba744a143ab4203077d48320933e2323a959 100644 (file)
@@ -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.
         */