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
920e1d36
Commit
920e1d36
authored
Jul 09, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't call any VFP->fini until we call all VFP->fini, and always call
it, no matter what.
parent
e5813c05
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
cache_fetch_proc.c
bin/varnishd/cache/cache_fetch_proc.c
+1
-3
No files found.
bin/varnishd/cache/cache_fetch_proc.c
View file @
920e1d36
...
@@ -114,7 +114,7 @@ vfp_suck_fini(struct busyobj *bo)
...
@@ -114,7 +114,7 @@ vfp_suck_fini(struct busyobj *bo)
struct
vfp_entry
*
vfe
;
struct
vfp_entry
*
vfe
;
VTAILQ_FOREACH
(
vfe
,
&
bo
->
vfp
,
list
)
VTAILQ_FOREACH
(
vfe
,
&
bo
->
vfp
,
list
)
if
(
vfe
->
closed
==
VFP_OK
&&
vfe
->
vfp
->
fini
!=
NULL
)
if
(
vfe
->
vfp
->
fini
!=
NULL
)
vfe
->
vfp
->
fini
(
bo
,
vfe
);
vfe
->
vfp
->
fini
(
bo
,
vfe
);
}
}
...
@@ -162,8 +162,6 @@ VFP_Suck(struct busyobj *bo, void *p, ssize_t *lp)
...
@@ -162,8 +162,6 @@ VFP_Suck(struct busyobj *bo, void *p, ssize_t *lp)
}
else
if
(
vfe
->
closed
==
VFP_OK
)
{
}
else
if
(
vfe
->
closed
==
VFP_OK
)
{
vp
=
vfe
->
vfp
->
pull
(
bo
,
vfe
,
p
,
lp
);
vp
=
vfe
->
vfp
->
pull
(
bo
,
vfe
,
p
,
lp
);
if
(
vp
==
VFP_END
||
vp
==
VFP_ERROR
)
{
if
(
vp
==
VFP_END
||
vp
==
VFP_ERROR
)
{
if
(
vfe
->
vfp
->
fini
!=
NULL
)
vfe
->
vfp
->
fini
(
bo
,
vfe
);
vfe
->
closed
=
vp
;
vfe
->
closed
=
vp
;
}
else
if
(
vp
!=
VFP_OK
)
}
else
if
(
vp
!=
VFP_OK
)
(
void
)
VFP_Error
(
bo
,
"Fetch filter %s returned %d"
,
(
void
)
VFP_Error
(
bo
,
"Fetch filter %s returned %d"
,
...
...
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