Skip to content

V
varnish-cache
Commit 968fc3ec authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Call the vcl_fini{} from the VGC's event(DISCARD).

parent f6a324eb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
bin/varnishd/cache/cache_vcl.c
View file @ 968fc3ec
...@@ -290,8 +290,6 @@ VCL_Nuke(struct vcls *vcl) ...@@ -290,8 +290,6 @@ VCL_Nuke(struct vcls *vcl)
ctx.method = VCL_MET_FINI; ctx.method = VCL_MET_FINI;
ctx.handling = &hand; ctx.handling = &hand;
ctx.vcl = vcl->conf; ctx.vcl = vcl->conf;
(void)vcl->conf->fini_func(&ctx);
assert(hand == VCL_RET_OK);
AZ(vcl->conf->event_vcl(&ctx, VCL_EVENT_DISCARD)); AZ(vcl->conf->event_vcl(&ctx, VCL_EVENT_DISCARD));
free(vcl->conf->loaded_name); free(vcl->conf->loaded_name);
(void)dlclose(vcl->dlh); (void)dlclose(vcl->dlh);
......
lib/libvcc/vcc_compile.c
View file @ 968fc3ec
...@@ -334,6 +334,7 @@ EmitInitFini(const struct vcc *tl) ...@@ -334,6 +334,7 @@ EmitInitFini(const struct vcc *tl)
*/ */
Fc(tl, 0, "\nstatic int\nVGC_Discard(VRT_CTX)\n{\n\n"); Fc(tl, 0, "\nstatic int\nVGC_Discard(VRT_CTX)\n{\n\n");
Fc(tl, 0, "\t(void)VGC_function_vcl_fini(ctx);\n\n");
VTAILQ_FOREACH_REVERSE(p, &tl->inifin, inifinhead, list) { VTAILQ_FOREACH_REVERSE(p, &tl->inifin, inifinhead, list) {
AZ(VSB_finish(p->fin)); AZ(VSB_finish(p->fin));
if (VSB_len(p->fin)) { if (VSB_len(p->fin)) {
......
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