From: Krzysztof Piotr Oledzki <ole@ans.pl>
Date: Thu, 29 May 2008 21:03:34 +0000 (+0200)
Subject: [BUG/CLEANUP] cookiedomain -> cookie_domain rename + free(p->cookie_domain)
X-Git-Tag: v1.3.16-rc1~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1acf2173669e2b82060412b2100943054ed620d5;p=thirdparty%2Fhaproxy.git

[BUG/CLEANUP] cookiedomain -> cookie_domain rename + free(p->cookie_domain)

Rename cookiedomain -> cookie_domain to be consistent with current
naming scheme. Also make sure cookie_domain is deallocated at deinit()
---

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 81e182dd0b..9129861c36 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -161,7 +161,7 @@ struct proxy {
 		void (*server_drop_conn)(struct server *);/* to be called when connection is dropped */
 	} lbprm;				/* LB parameters for all algorithms */
 
-	char *cookiedomain;			/* domain used to insert the cookie */
+	char *cookie_domain;			/* domain used to insert the cookie */
 	char *cookie_name;			/* name of the cookie to look for */
 	int  cookie_len;			/* strlen(cookie_name), computed only once */
 	char *url_param_name;			/* name of the URL parameter used for hashing */
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 9ca8ae64f4..e4308bf6dd 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -917,7 +917,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 					return -1;
 				}
 
-				curproxy->cookiedomain = strdup(args[cur_arg + 1]);
+				curproxy->cookie_domain = strdup(args[cur_arg + 1]);
 				cur_arg++;
 			}
 			else {
diff --git a/src/haproxy.c b/src/haproxy.c
index fc82d2f8fe..b42728eccb 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -658,6 +658,9 @@ void deinit(void)
 		if (p->cookie_name)
 			free(p->cookie_name);
 
+		if (p->cookie_domain)
+			free(p->cookie_domain);
+
 		if (p->url_param_name)
 			free(p->url_param_name);
 
diff --git a/src/proto_http.c b/src/proto_http.c
index 3caeba1cff..066db30dca 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3222,8 +3222,8 @@ int process_srv(struct session *t)
 				      t->be->cookie_name,
 				      t->srv->cookie ? t->srv->cookie : "; Expires=Thu, 01-Jan-1970 00:00:01 GMT");
 
-			if (t->be->cookiedomain)
-				len += sprintf(trash+len, "; domain=%s", t->be->cookiedomain);
+			if (t->be->cookie_domain)
+				len += sprintf(trash+len, "; domain=%s", t->be->cookie_domain);
 
 			if (unlikely(http_header_add_tail2(rep, &txn->rsp, &txn->hdr_idx,
 							   trash, len)) < 0)