Use sp->bereq for handover to PipeSession

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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 9cb4025818e230885f64b7df555e35263971a00f..b15e84ece03df9a93427f7e2981f6c4135622389 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -439,7 +439,7 @@ void http_CopyHome(struct worker *w, int fd, struct http *hp);
 #undef HTTPH
 
 /* cache_pipe.c */
-void PipeSession(struct sess *sp, struct bereq *bereq);
+void PipeSession(struct sess *sp);
 
 /* cache_pool.c */
 void WRK_Init(void);

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index 5965083aae9cf8cdd74b4d288c80a04860a9984d..d9b871cde2be9618a212de03bd30f671671d50d0 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -651,7 +651,8 @@ cnt_pipe(struct sess *sp)
        if (sp->handling == VCL_RET_ERROR)
                INCOMPL();
 
-       PipeSession(sp, bereq);
+       sp->bereq = bereq;
+       PipeSession(sp);
        sp->step = STP_DONE;
        return (0);
 }

diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index f32444512b03d0a6ede0fd5da54f6c6b06e2aab2..195ec0fc39caba3b1ef7359f9cec4e7e39540bcc 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -72,17 +72,20 @@ rdf(struct pollfd *fds, int idx)
 }
 
 void
-PipeSession(struct sess *sp, struct bereq *bereq)
+PipeSession(struct sess *sp)
 {
        struct vbe_conn *vc;
        char *b, *e;
        struct worker *w;
+       struct bereq *bereq;
        struct pollfd fds[2];
        int i;
 
        CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
        CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
        w = sp->wrk;
+       bereq = sp->bereq;
+       sp->bereq = NULL;
 
        vc = VBE_GetFd(sp);
        if (vc == NULL)