Use vca_write/vca_flush

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@167 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 57425cba3b235cda125e27a1b542b6e402d172e1..32816a41a1a8551c72d400a189b561350a56a58c 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -69,7 +69,6 @@ static int
 DeliverSession(struct worker *w, struct sess *sp)
 {
        char buf[BUFSIZ];
-       int i, j;
        struct storage *st;
 
        sprintf(buf,
@@ -78,13 +77,10 @@ DeliverSession(struct worker *w, struct sess *sp)
            "Content-Length: %u\r\n"
            "\r\n", sp->obj->len);
 
-       j = strlen(buf);
-       i = write(sp->fd, buf, j);
-       assert(i == j);
-       TAILQ_FOREACH(st, &sp->obj->store, list) {
-               i = write(sp->fd, st->ptr, st->len);
-               assert(i == st->len);
-       }
+       vca_write(sp, buf, strlen(buf));
+       TAILQ_FOREACH(st, &sp->obj->store, list)
+               vca_write(sp, st->ptr, st->len);
+       vca_flush(sp);
        return (1);
 }
 
@@ -126,7 +122,6 @@ CacheWorker(void *priv)
                sp->handling = HND_Lookup;
                
                sp->vcl->recv_func(sp);
-               sp->handling = HND_Pass;
 
                for (done = 0; !done; ) {
                        switch(sp->handling) {