Commit b75f1654 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

VBE_ClosedFd() was badly named, loose the 'd' to indicate that it

will close the Fd, rather than being an indication this already
happened.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5081 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent a9cad4da
...@@ -476,7 +476,7 @@ extern pthread_t VCA_thread; ...@@ -476,7 +476,7 @@ extern pthread_t VCA_thread;
struct vbe_conn *VBE_GetFd(const struct director *, struct sess *sp); struct vbe_conn *VBE_GetFd(const struct director *, struct sess *sp);
int VBE_Healthy(double now, const struct director *, uintptr_t target); int VBE_Healthy(double now, const struct director *, uintptr_t target);
int VBE_Healthy_sp(const struct sess *sp, const struct director *); int VBE_Healthy_sp(const struct sess *sp, const struct director *);
void VBE_ClosedFd(struct sess *sp); void VBE_CloseFd(struct sess *sp);
void VBE_RecycleFd(struct sess *sp); void VBE_RecycleFd(struct sess *sp);
void VBE_AddHostHeader(const struct sess *sp); void VBE_AddHostHeader(const struct sess *sp);
void VBE_Poll(void); void VBE_Poll(void);
......
...@@ -342,7 +342,7 @@ vbe_GetVbe(struct sess *sp, struct backend *bp) ...@@ -342,7 +342,7 @@ vbe_GetVbe(struct sess *sp, struct backend *bp)
} }
VSC_main->backend_toolate++; VSC_main->backend_toolate++;
sp->vbe = vc; sp->vbe = vc;
VBE_ClosedFd(sp); VBE_CloseFd(sp);
} }
if (!vbe_Healthy(sp->t_req, (uintptr_t)sp->objhead, bp)) { if (!vbe_Healthy(sp->t_req, (uintptr_t)sp->objhead, bp)) {
...@@ -374,7 +374,7 @@ vbe_GetVbe(struct sess *sp, struct backend *bp) ...@@ -374,7 +374,7 @@ vbe_GetVbe(struct sess *sp, struct backend *bp)
/* Close a connection ------------------------------------------------*/ /* Close a connection ------------------------------------------------*/
void void
VBE_ClosedFd(struct sess *sp) VBE_CloseFd(struct sess *sp)
{ {
struct backend *bp; struct backend *bp;
......
...@@ -374,7 +374,7 @@ FetchHdr(struct sess *sp) ...@@ -374,7 +374,7 @@ FetchHdr(struct sess *sp)
i = FetchReqBody(sp); i = FetchReqBody(sp);
if (WRW_FlushRelease(w) || i > 0) { if (WRW_FlushRelease(w) || i > 0) {
WSP(sp, SLT_FetchError, "backend write error: %d", errno); WSP(sp, SLT_FetchError, "backend write error: %d", errno);
VBE_ClosedFd(sp); VBE_CloseFd(sp);
/* XXX: other cleanup ? */ /* XXX: other cleanup ? */
return (__LINE__); return (__LINE__);
} }
...@@ -397,7 +397,7 @@ FetchHdr(struct sess *sp) ...@@ -397,7 +397,7 @@ FetchHdr(struct sess *sp)
if (i < 0) { if (i < 0) {
WSP(sp, SLT_FetchError, WSP(sp, SLT_FetchError,
"http read error: %d", errno); "http read error: %d", errno);
VBE_ClosedFd(sp); VBE_CloseFd(sp);
/* XXX: other cleanup ? */ /* XXX: other cleanup ? */
return (__LINE__); return (__LINE__);
} }
...@@ -412,7 +412,7 @@ FetchHdr(struct sess *sp) ...@@ -412,7 +412,7 @@ FetchHdr(struct sess *sp)
if (http_DissectResponse(sp->wrk, sp->wrk->htc, hp)) { if (http_DissectResponse(sp->wrk, sp->wrk->htc, hp)) {
WSP(sp, SLT_FetchError, "http format error"); WSP(sp, SLT_FetchError, "http format error");
VBE_ClosedFd(sp); VBE_CloseFd(sp);
/* XXX: other cleanup ? */ /* XXX: other cleanup ? */
return (__LINE__); return (__LINE__);
} }
...@@ -466,7 +466,7 @@ FetchBody(struct sess *sp) ...@@ -466,7 +466,7 @@ FetchBody(struct sess *sp)
sp->wrk->stats.fetch_bad++; sp->wrk->stats.fetch_bad++;
/* XXX: AUGH! */ /* XXX: AUGH! */
WSL(sp->wrk, SLT_Debug, vc->fd, "Invalid Transfer-Encoding"); WSL(sp->wrk, SLT_Debug, vc->fd, "Invalid Transfer-Encoding");
VBE_ClosedFd(sp); VBE_CloseFd(sp);
return (__LINE__); return (__LINE__);
} else if (http_HdrIs(hp, H_Connection, "keep-alive")) { } else if (http_HdrIs(hp, H_Connection, "keep-alive")) {
/* /*
...@@ -515,7 +515,7 @@ FetchBody(struct sess *sp) ...@@ -515,7 +515,7 @@ FetchBody(struct sess *sp)
VTAILQ_REMOVE(&sp->obj->store, st, list); VTAILQ_REMOVE(&sp->obj->store, st, list);
STV_free(st); STV_free(st);
} }
VBE_ClosedFd(sp); VBE_CloseFd(sp);
sp->obj->len = 0; sp->obj->len = 0;
return (__LINE__); return (__LINE__);
} }
...@@ -540,7 +540,7 @@ FetchBody(struct sess *sp) ...@@ -540,7 +540,7 @@ FetchBody(struct sess *sp)
cls = 1; cls = 1;
if (cls) if (cls)
VBE_ClosedFd(sp); VBE_CloseFd(sp);
else else
VBE_RecycleFd(sp); VBE_RecycleFd(sp);
......
...@@ -91,7 +91,7 @@ PipeSession(struct sess *sp) ...@@ -91,7 +91,7 @@ PipeSession(struct sess *sp)
if (i) { if (i) {
vca_close_session(sp, "pipe"); vca_close_session(sp, "pipe");
VBE_ClosedFd(sp); VBE_CloseFd(sp);
return; return;
} }
...@@ -135,5 +135,5 @@ PipeSession(struct sess *sp) ...@@ -135,5 +135,5 @@ PipeSession(struct sess *sp)
(void)shutdown(vc->fd, SHUT_WR); (void)shutdown(vc->fd, SHUT_WR);
} }
vca_close_session(sp, "pipe"); vca_close_session(sp, "pipe");
VBE_ClosedFd(sp); VBE_CloseFd(sp);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment