Commit 718e8772 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Wrap lines

parent ff61fc34
...@@ -348,7 +348,8 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs) ...@@ -348,7 +348,8 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
/* XXX locking of stats */ /* XXX locking of stats */
VSC_C_main->backend_reuse += 1; VSC_C_main->backend_reuse += 1;
WSP(sp, SLT_Backend, "%d %s %s", WSP(sp, SLT_Backend, "%d %s %s",
vc->fd, sp->req->director->vcl_name, bp->display_name); vc->fd, sp->req->director->vcl_name,
bp->display_name);
vc->vdis = vs; vc->vdis = vs;
vc->recycled = 1; vc->recycled = 1;
return (vc); return (vc);
......
...@@ -307,7 +307,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh) ...@@ -307,7 +307,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
wrk = sp->wrk; wrk = sp->wrk;
HSH_Prealloc(sp); HSH_Prealloc(sp);
memcpy(sp->wrk->nobjhead->digest, sp->req->digest, sizeof sp->req->digest); memcpy(sp->wrk->nobjhead->digest, sp->req->digest,
sizeof sp->req->digest);
if (cache_param->diag_bitmap & 0x80000000) if (cache_param->diag_bitmap & 0x80000000)
hsh_testmagic(sp->wrk->nobjhead->digest); hsh_testmagic(sp->wrk->nobjhead->digest);
......
...@@ -880,7 +880,8 @@ http_FilterHeader(const struct sess *sp, unsigned how) ...@@ -880,7 +880,8 @@ http_FilterHeader(const struct sess *sp, unsigned how)
else else
http_copyh(hp, sp->req->http, HTTP_HDR_PROTO); http_copyh(hp, sp->req->http, HTTP_HDR_PROTO);
http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->req->http, how); http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->req->http, how);
http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->req->xid); http_PrintfHeader(sp->wrk, sp->vsl_id, hp,
"X-Varnish: %u", sp->req->xid);
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
......
...@@ -84,7 +84,8 @@ PipeSession(struct sess *sp) ...@@ -84,7 +84,8 @@ PipeSession(struct sess *sp)
if (sp->req->htc->pipeline.b != NULL) if (sp->req->htc->pipeline.b != NULL)
sp->wrk->acct_tmp.bodybytes += sp->wrk->acct_tmp.bodybytes +=
WRW_Write(w, sp->req->htc->pipeline.b, Tlen(sp->req->htc->pipeline)); WRW_Write(w, sp->req->htc->pipeline.b,
Tlen(sp->req->htc->pipeline));
i = WRW_FlushRelease(w); i = WRW_FlushRelease(w);
......
...@@ -139,7 +139,8 @@ RES_BuildHttp(const struct sess *sp) ...@@ -139,7 +139,8 @@ RES_BuildHttp(const struct sess *sp)
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
"X-Varnish: %u", sp->req->xid); "X-Varnish: %u", sp->req->xid);
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f", http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
sp->wrk->obj->exp.age + sp->req->t_resp - sp->wrk->obj->exp.entered); sp->wrk->obj->exp.age + sp->req->t_resp -
sp->wrk->obj->exp.entered);
http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish"); http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s", http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
sp->req->doclose ? "close" : "keep-alive"); sp->req->doclose ? "close" : "keep-alive");
......
...@@ -187,7 +187,8 @@ VRY_Match(const struct sess *sp, const uint8_t *vary) ...@@ -187,7 +187,8 @@ VRY_Match(const struct sess *sp, const uint8_t *vary)
if (i == 1) { if (i == 1) {
/* Build a new entry */ /* Build a new entry */
i = http_GetHdr(sp->req->http, (const char*)(vary+2), &h); i = http_GetHdr(sp->req->http,
(const char*)(vary+2), &h);
if (i) { if (i) {
/* Trim trailing space */ /* Trim trailing space */
e = strchr(h, '\0'); e = strchr(h, '\0');
......
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