Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
dfe6df9a
Commit
dfe6df9a
authored
Oct 26, 2020
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename bo->filter_list -> bo->vfp_filter_list
parent
276ca5e8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
18 deletions
+19
-18
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+7
-7
cache_panic.c
bin/varnishd/cache/cache_panic.c
+2
-2
cache_vrt_filter.c
bin/varnishd/cache/cache_vrt_filter.c
+6
-6
cache_vrt_var.c
bin/varnishd/cache/cache_vrt_var.c
+3
-2
No files found.
bin/varnishd/cache/cache.h
View file @
dfe6df9a
...
...
@@ -382,7 +382,7 @@ struct busyobj {
struct
worker
*
wrk
;
struct
vfp_ctx
*
vfc
;
const
char
*
filter_list
;
const
char
*
vfp_
filter_list
;
struct
ws
ws
[
1
];
uintptr_t
ws_bo
;
...
...
bin/varnishd/cache/cache_fetch.c
View file @
dfe6df9a
...
...
@@ -127,7 +127,7 @@ vbf_cleanup(struct busyobj *bo)
CHECK_OBJ_NOTNULL
(
vfc
,
VFP_CTX_MAGIC
);
bo
->
acct
.
beresp_bodybytes
+=
VFP_Close
(
vfc
);
bo
->
filter_list
=
NULL
;
bo
->
vfp_
filter_list
=
NULL
;
if
(
bo
->
director_state
!=
DIR_S_NULL
)
VDI_Finish
(
bo
);
...
...
@@ -147,7 +147,7 @@ Bereq_Rollback(struct busyobj *bo)
VCL_TaskLeave
(
bo
->
privs
);
VCL_TaskEnter
(
bo
->
privs
);
HTTP_Clone
(
bo
->
bereq
,
bo
->
bereq0
);
bo
->
filter_list
=
NULL
;
bo
->
vfp_
filter_list
=
NULL
;
bo
->
err_reason
=
NULL
;
WS_Rollback
(
bo
->
bereq
->
ws
,
bo
->
ws_bo
);
WS_Rollback
(
bo
->
ws
,
bo
->
ws_bo
);
...
...
@@ -635,13 +635,13 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
http_Unset
(
bo
->
beresp
,
H_Content_Encoding
);
bo
->
do_gzip
=
bo
->
do_gunzip
=
0
;
bo
->
do_stream
=
0
;
bo
->
filter_list
=
""
;
}
else
if
(
bo
->
filter_list
==
NULL
)
{
bo
->
filter_list
=
VBF_Get_Filter_List
(
bo
);
bo
->
vfp_
filter_list
=
""
;
}
else
if
(
bo
->
vfp_
filter_list
==
NULL
)
{
bo
->
vfp_
filter_list
=
VBF_Get_Filter_List
(
bo
);
}
if
(
bo
->
filter_list
==
NULL
||
VCL_StackVFP
(
bo
->
vfc
,
bo
->
vcl
,
bo
->
filter_list
))
{
if
(
bo
->
vfp_
filter_list
==
NULL
||
VCL_StackVFP
(
bo
->
vfc
,
bo
->
vcl
,
bo
->
vfp_
filter_list
))
{
(
bo
)
->
htc
->
doclose
=
SC_OVERLOAD
;
vbf_cleanup
(
bo
);
return
(
F_STP_ERROR
);
...
...
bin/varnishd/cache/cache_panic.c
View file @
dfe6df9a
...
...
@@ -391,8 +391,8 @@ pan_busyobj(struct vsb *vsb, const struct busyobj *bo)
if
(
bo
->
vfc
!=
NULL
)
pan_vfp
(
vsb
,
bo
->
vfc
);
if
(
bo
->
filter_list
!=
NULL
)
VSB_printf
(
vsb
,
"filter_list =
\"
%s
\"
,
\n
"
,
bo
->
filter_list
);
if
(
bo
->
vfp_
filter_list
!=
NULL
)
VSB_printf
(
vsb
,
"filter_list =
\"
%s
\"
,
\n
"
,
bo
->
vfp_
filter_list
);
WS_Panic
(
bo
->
ws
,
vsb
);
VSB_printf
(
vsb
,
"ws_bo = %p,
\n
"
,
(
void
*
)
bo
->
ws_bo
);
...
...
bin/varnishd/cache/cache_vrt_filter.c
View file @
dfe6df9a
...
...
@@ -386,14 +386,14 @@ resp_Get_Filter_List(struct req *req)
/*--------------------------------------------------------------------*/
#define FILTER_VAR(vcl, in, func) \
#define FILTER_VAR(vcl, in, func
, fld
) \
VCL_STRING \
VRT_r_##vcl##_filters(VRT_CTX) \
{ \
\
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); \
if (ctx->in->f
ilter_list != NULL)
\
return(ctx->in->f
ilter_list);
\
if (ctx->in->f
ld != NULL)
\
return(ctx->in->f
ld);
\
return (func(ctx->in)); \
} \
\
...
...
@@ -410,8 +410,8 @@ resp_Get_Filter_List(struct req *req)
if (b == NULL) \
WS_MarkOverflow(ctx->in->ws); \
else \
ctx->in->f
ilter_list = b;
\
ctx->in->f
ld = b;
\
}
FILTER_VAR
(
beresp
,
bo
,
VBF_Get_Filter_List
)
FILTER_VAR
(
resp
,
req
,
resp_Get_Filter_List
)
FILTER_VAR
(
beresp
,
bo
,
VBF_Get_Filter_List
,
vfp_filter_list
)
FILTER_VAR
(
resp
,
req
,
resp_Get_Filter_List
,
filter_list
)
bin/varnishd/cache/cache_vrt_var.c
View file @
dfe6df9a
...
...
@@ -189,9 +189,10 @@ VRT_r_obj_reason(VRT_CTX)
static
inline
int
beresp_filter_fixed
(
VRT_CTX
,
const
char
*
s
)
{
if
(
ctx
->
bo
->
filter_list
==
NULL
)
if
(
ctx
->
bo
->
vfp_
filter_list
==
NULL
)
return
(
0
);
VRT_fail
(
ctx
,
"beresp.filters are already fixed, beresp.%s is undefined"
,
s
);
VRT_fail
(
ctx
,
"beresp.filters are already fixed, beresp.%s is undefined"
,
s
);
return
(
1
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment