Adjust to vxid changes in varnish-cache

Ref afbe6b648503687b1e9a2571a9e87ab089fc7bee
parent 1097f6f4
...@@ -338,12 +338,12 @@ vped_include(struct req *preq, const char *src, const char *host, ...@@ -338,12 +338,12 @@ vped_include(struct req *preq, const char *src, const char *host,
req = Req_New(sp); req = Req_New(sp);
AN(req); AN(req);
VSLdbgv(preq, "vped_include: new req=%p", req); VSLdbgv(preq, "vped_include: new req=%p", req);
AZ(req->vsl->wid); assert(VXID(req->vsl->wid) == VXID(NO_VXID));
req->vsl->wid = VXID_Get(wrk, VSL_CLIENTMARKER); req->vsl->wid = VXID_Get(wrk, VSL_CLIENTMARKER);
VSLdbgv(preq, "vped_include: new xid=%d", VXID(req->vsl->wid)); VSLdbgv(preq, "vped_include: new xid=%d", VXID(req->vsl->wid));
VSLb(req->vsl, SLT_Begin, "req %u esi", VXID(preq->vsl->wid)); VSLb(req->vsl, SLT_Begin, "req %ju esi", VXID(preq->vsl->wid));
VSLb(preq->vsl, SLT_Link, "req %u esi", VXID(req->vsl->wid)); VSLb(preq->vsl, SLT_Link, "req %ju esi", VXID(req->vsl->wid));
req->esi_level = preq->esi_level + 1; req->esi_level = preq->esi_level + 1;
...@@ -464,7 +464,7 @@ vped_include(struct req *preq, const char *src, const char *host, ...@@ -464,7 +464,7 @@ vped_include(struct req *preq, const char *src, const char *host,
pesi->no_thread++; pesi->no_thread++;
VSLb(preq->vsl, SLT_Error, "vdp pesi: No thread available " VSLb(preq->vsl, SLT_Error, "vdp pesi: No thread available "
"for ESI subrequest %u, continuing in serial", "for ESI subrequest %ju, continuing in serial",
VXID(req->vsl->wid)); VXID(req->vsl->wid));
/* /*
......
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