commit 1acf2173669e2b82060412b2100943054ed620d5
author Krzysztof Piotr Oledzki <ole@ans.pl> Thu May 29 23:03:34 2008 +0200
committer Willy Tarreau <w@1wt.eu> Fri May 30 07:03:22 2008 +0200
tree e77a178716ac9bbab6e46c1426a39cf5f8b231c8
parent 8a7af6031240c162a09095c7c7e7e99c1e6a9549

[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()

src/cfgparse.c

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 9ca8ae6..e4308bf 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -917,7 +917,7 @@
 					return -1;
 				}
 
-				curproxy->cookiedomain = strdup(args[cur_arg + 1]);
+				curproxy->cookie_domain = strdup(args[cur_arg + 1]);
 				cur_arg++;
 			}
 			else {

src/haproxy.c

diff --git a/src/haproxy.c b/src/haproxy.c
index fc82d2f..b42728e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -658,6 +658,9 @@
 		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);
 

src/proto_http.c

diff --git a/src/proto_http.c b/src/proto_http.c
index 3caeba1..066db30 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3222,8 +3222,8 @@
 				      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)