From: Willy Tarreau <w@1wt.eu>
Date: Thu, 3 Dec 2009 22:13:06 +0000 (+0100)
Subject: [BUG] config: cookie domain was ignored in defaults sections
X-Git-Tag: v1.4-dev5~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d187ac35081d3e5684cbb5dd97cbc5eaa89fcde;p=thirdparty%2Fhaproxy.git

[BUG] config: cookie domain was ignored in defaults sections

Since cookie can appear in a defaults section, the domain extension
must be supported there as well.

(cherry picked from commit baf78c8e03db8c2255aefb6e11b38b48d1ec5d34)
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index f7b6a04db2..d433ea314c 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -958,6 +958,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 			if (defproxy.cookie_name)
 				curproxy->cookie_name = strdup(defproxy.cookie_name);
 			curproxy->cookie_len = defproxy.cookie_len;
+			if (defproxy.cookie_domain)
+				curproxy->cookie_domain = strdup(defproxy.cookie_domain);
 
 			if (defproxy.rdp_cookie_name)
 				 curproxy->rdp_cookie_name = strdup(defproxy.rdp_cookie_name);
@@ -1031,6 +1033,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 		free(defproxy.check_req);
 		free(defproxy.cookie_name);
 		free(defproxy.rdp_cookie_name);
+		free(defproxy.cookie_domain);
 		free(defproxy.url_param_name);
 		free(defproxy.hh_name);
 		free(defproxy.capture_name);
@@ -1422,6 +1425,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 			goto out;
 		}
 
+		free(curproxy->cookie_domain); curproxy->cookie_domain = NULL;
 		free(curproxy->cookie_name);
 		curproxy->cookie_name = strdup(args[1]);
 		curproxy->cookie_len = strlen(curproxy->cookie_name);