Skip to content

V
varnish-cache
Commit f3f8aa16 authored by Guillaume Quintard's avatar Guillaume Quintard
Browse files
Options

Directly use ctx->ws (thanks Nils)

parent 9023b992
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
bin/varnishd/cache/cache_vrt_var.c
View file @ f3f8aa16
...@@ -690,10 +690,9 @@ VRT_r_bereq_xid(VRT_CTX) ...@@ -690,10 +690,9 @@ VRT_r_bereq_xid(VRT_CTX)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC); CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(ctx->bo->bereq, HTTP_MAGIC);
AN(ctx->bo->vsl); AN(ctx->bo->vsl);
return (WS_Printf(ctx->bo->bereq->ws, "%u", return (WS_Printf(ctx->ws, "%u",
VXID(ctx->bo->vsl->wid))); VXID(ctx->bo->vsl->wid)));
} }
...@@ -701,25 +700,19 @@ VCL_STRING ...@@ -701,25 +700,19 @@ VCL_STRING
VRT_r_sess_xid(VRT_CTX) VRT_r_sess_xid(VRT_CTX)
{ {
struct sess *sp; struct sess *sp;
struct http *http;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
if (ctx->req) { if (ctx->req) {
CHECK_OBJ(ctx->req, REQ_MAGIC); CHECK_OBJ(ctx->req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(ctx->req->http, HTTP_MAGIC);
sp = ctx->req->sp; sp = ctx->req->sp;
http = ctx->req->http;
} else { } else {
CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC); CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(ctx->bo->bereq, HTTP_MAGIC);
sp = ctx->bo->sp; sp = ctx->bo->sp;
http = ctx->bo->bereq;
} }
CHECK_OBJ_NOTNULL(http, HTTP_MAGIC);
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
return (WS_Printf(http->ws, "%u", VXID(sp->vxid))); return (WS_Printf(ctx->ws, "%u", VXID(sp->vxid)));
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
......
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