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
0302e16e
Commit
0302e16e
authored
Jan 07, 2015
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expire superseded objects also if they are no IMS/INM candidates
parent
99cc7a7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+3
-2
c00058.vtc
bin/varnishtest/tests/c00058.vtc
+7
-0
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
0302e16e
...
...
@@ -192,7 +192,8 @@ vbf_stp_mkbereq(const struct worker *wrk, struct busyobj *bo)
http_CopyHome
(
bo
->
bereq0
);
}
if
(
bo
->
ims_oc
!=
NULL
)
{
if
(
bo
->
ims_oc
!=
NULL
&&
ObjCheckFlag
(
bo
->
wrk
,
bo
->
ims_oc
,
OF_IMSCAND
))
{
q
=
HTTP_GetHdrPack
(
bo
->
wrk
,
bo
->
ims_oc
,
H_Last_Modified
);
if
(
q
!=
NULL
)
http_PrintfHeader
(
bo
->
bereq0
,
...
...
@@ -974,7 +975,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
bo
->
fetch_objcore
=
oc
;
AZ
(
bo
->
ims_oc
);
if
(
oldoc
!=
NULL
&&
ObjCheckFlag
(
req
->
wrk
,
oldoc
,
OF_IMSCAND
)
)
{
if
(
oldoc
!=
NULL
)
{
assert
(
oldoc
->
refcnt
>
0
);
HSH_Ref
(
oldoc
);
bo
->
ims_oc
=
oldoc
;
...
...
bin/varnishtest/tests/c00058.vtc
View file @
0302e16e
...
...
@@ -22,7 +22,11 @@ client c1 {
expect resp.bodylen == 3
delay 1
} -run
varnish v1 -expect n_object == 1
client c1 {
# We still get old object
txreq
rxresp
...
...
@@ -37,3 +41,6 @@ client c1 {
rxresp
expect resp.bodylen == 6
} -run
# and the old one has got superseded
varnish v1 -expect n_object == 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