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.3.23~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baf78c8e03db8c2255aefb6e11b38b48d1ec5d34;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.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index fb5b2f5ed5..b2e6145f5e 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -910,6 +910,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			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.url_param_name)
 				curproxy->url_param_name = strdup(defproxy.url_param_name);
@@ -977,6 +979,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 		 */
 		free(defproxy.check_req);
 		free(defproxy.cookie_name);
+		free(defproxy.cookie_domain);
 		free(defproxy.url_param_name);
 		free(defproxy.hh_name);
 		free(defproxy.capture_name);
@@ -1253,6 +1256,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			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);