r1977 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-09-21 11:49:44 +0200 (Fri, 21 Sep 2007)
New Revision: 1977

Modified:
   trunk/varnish-cache/bin/varnishd/cache_response.c
Log:
Don't leak 50 bytes when creating the new Date: header.


Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2007-09-21 09:49:05 UTC (rev 1976)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2007-09-21 09:49:44 UTC (rev 1977)
@@ -111,7 +111,7 @@
 void
 RES_BuildHttp(struct sess *sp)
 {
-	char *time_str;
+	char time_str[30];
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
@@ -126,16 +126,8 @@
 	http_FilterFields(sp->wrk, sp->fd, sp->http, &sp->obj->http,
 	    HTTPH_A_DELIVER);
 	
-	/* Replace Date header with current date instead of keeping the date
-	 * originally given by the backend when the object was fetched (which
-	 * could be a long time ago).
-	 */
-	http_Unset(sp->http, H_Date);
-	time_str = malloc(50);
-	XXXAN(time_str);
-	sprintf(time_str, "Date: ");
-	TIM_format(TIM_real(), &(time_str[6]));
-	http_SetHeader(sp->wrk, sp->fd, sp->http, time_str);
+	TIM_format(TIM_real(), time_str);
+	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Date: %s", time_str);
 	
 	if (sp->xid != sp->obj->xid)
 		http_PrintfHeader(sp->wrk, sp->fd, sp->http,