r1694 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-07-13 17:31:37 +0200 (Fri, 13 Jul 2007)
New Revision: 1694

Modified:
   trunk/varnish-cache/bin/varnishd/cache_response.c
Log:
Fix 304 responses, they got messed up in the vcl_deliver() addition.



Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2007-07-13 14:54:51 UTC (rev 1693)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2007-07-13 15:31:37 UTC (rev 1694)
@@ -69,8 +69,7 @@
 
 	http_ClrHeader(sp->http);
 	sp->http->logtag = HTTP_Tx;
-	http_SetResp(sp->http,
-	    "HTTP/1.1", "304", "Not Modified");
+	http_SetResp(sp->http, "HTTP/1.1", "304", "Not Modified");
 	TIM_format(sp->t_req, lm);
 	http_PrintfHeader(sp->wrk, sp->fd, sp->http, "Date: %s", lm);
 	http_SetHeader(sp->wrk, sp->fd, sp->http, "Via: 1.1 varnish");
@@ -81,8 +80,7 @@
 		http_SetHeader(sp->wrk, sp->fd, sp->http, "Connection: close");
 	WRK_Reset(sp->wrk, &sp->fd);
 	sp->wrk->acct.hdrbytes += http_Write(sp->wrk, sp->http, 1);
-	if (WRK_Flush(sp->wrk))
-		vca_close_session(sp, "remote closed");
+	sp->wantbody = 0;
 }
 
 /*--------------------------------------------------------------------*/