head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2007.08.20.21.55.55;	author des;	state dead;
branches;
next	1.1;

1.1
date	2007.07.25.11.09.07;	author des;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade to 1.1.1.
@
text
@Index: bin/varnishd/cache_response.c
===================================================================
--- bin/varnishd/cache_response.c	(revision 1749)
+++ bin/varnishd/cache_response.c	(revision 1750)
@@@@ -76,8 +76,8 @@@@
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "X-Varnish: %u", sp->xid);
 	TIM_format(sp->obj->last_modified, lm);
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Last-Modified: %s", lm);
-	if (sp->doclose != NULL)
-		http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close");
+	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s",
+	    sp->doclose ? "close" : "keep-alive");
 	sp->wantbody = 0;
 }
 
@@@@ -129,8 +129,8 @@@@
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Age: %.0f",
 	    sp->obj->age + sp->t_resp - sp->obj->entered);
 	http_SetHeader(sp->wrk, sp->fd, sp->http, "Via: 1.1 varnish");
-	if (sp->doclose != NULL)
-		http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close");
+	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Connection: %s",
+	    sp->doclose ? "close" : "keep-alive");
 }
 
 /*--------------------------------------------------------------------*/
@


1.1
log
@Upgrade to 1.1 + vendor patches for a number of regressions.
@
text
@@

