r3626 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-05 13:40:54 +0100 (Thu, 05 Feb 2009)
New Revision: 3626

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_response.c
Log:
Merge r3422: Do not count chunked encoding headers in stat.hdrbytes.



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_response.c	2009-02-05 12:36:41 UTC (rev 3625)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_response.c	2009-02-05 12:40:54 UTC (rev 3626)
@@ -146,8 +146,7 @@
 	} else if (sp->wantbody) {
 		if (sp->esis > 0 && sp->http->protover >= 1.1) {
 			sprintf(lenbuf, "%x\r\n", sp->obj->len);
-			sp->wrk->acct.hdrbytes +=
-			    WRK_Write(sp->wrk, lenbuf, -1);
+			(void)WRK_Write(sp->wrk, lenbuf, -1);
 		}
 
 		VTAILQ_FOREACH(st, &sp->obj->store, list) {
@@ -171,11 +170,11 @@
 			}
 #endif /* SENDFILE_WORKS */
 			VSL_stats->n_objwrite++;
-			WRK_Write(sp->wrk, st->ptr, st->len);
+			(void)WRK_Write(sp->wrk, st->ptr, st->len);
 		}
 		assert(u == sp->obj->len);
 		if (sp->esis > 0 && sp->http->protover >= 1.1)
-			WRK_Write(sp->wrk, "\r\n", -1);
+			(void)WRK_Write(sp->wrk, "\r\n", -1);
 	}
 	if (WRK_Flush(sp->wrk))
 		vca_close_session(sp, "remote closed");