Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
a3607f03
Commit
a3607f03
authored
Jun 28, 2011
by
Martin Blix Grydeland
Committed by
Tollef Fog Heen
Aug 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reintroduce TTL VCL logging that was lost in commit
a21746d2
. Fixes: #941
parent
58d36cb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
2 deletions
+29
-2
cache_vrt_var.c
bin/varnishd/cache_vrt_var.c
+5
-2
r00941.vtc
bin/varnishtest/tests/r00941.vtc
+24
-0
No files found.
bin/varnishd/cache_vrt_var.c
View file @
a3607f03
...
...
@@ -385,10 +385,13 @@ VRT_DO_EXP(req, sp->exp, ttl, )
VRT_DO_EXP
(
req
,
sp
->
exp
,
grace
,
)
VRT_DO_EXP
(
req
,
sp
->
exp
,
keep
,
)
VRT_DO_EXP
(
obj
,
sp
->
obj
->
exp
,
grace
,
EXP_Rearm
(
sp
->
obj
))
VRT_DO_EXP
(
obj
,
sp
->
obj
->
exp
,
ttl
,
EXP_Rearm
(
sp
->
obj
))
VRT_DO_EXP
(
obj
,
sp
->
obj
->
exp
,
ttl
,
EXP_Rearm
(
sp
->
obj
);
WSP
(
sp
,
SLT_TTL
,
"%u VCL %.0f %.0f"
,
sp
->
obj
->
xid
,
a
,
sp
->
t_req
))
VRT_DO_EXP
(
obj
,
sp
->
obj
->
exp
,
keep
,
EXP_Rearm
(
sp
->
obj
))
VRT_DO_EXP
(
beresp
,
sp
->
wrk
->
exp
,
grace
,
)
VRT_DO_EXP
(
beresp
,
sp
->
wrk
->
exp
,
ttl
,
)
VRT_DO_EXP
(
beresp
,
sp
->
wrk
->
exp
,
ttl
,
WSP
(
sp
,
SLT_TTL
,
"%u VCL %.0f %.0f"
,
sp
->
xid
,
a
,
sp
->
t_req
))
VRT_DO_EXP
(
beresp
,
sp
->
wrk
->
exp
,
keep
,
)
/*--------------------------------------------------------------------
...
...
bin/varnishtest/tests/r00941.vtc
0 → 100644
View file @
a3607f03
varnishtest "beresp.ttl set in vcl takes effect"
server s1 {
rxreq
txresp -hdr "Cache-control: max-age=1" -body "FOO"
rxreq
txresp -body "FOOBAR"
} -start
varnish v1 -vcl+backend {
sub vcl_fetch {
set beresp.ttl = 1000s;
}
} -start
client c1 {
txreq
rxresp
expect resp.bodylen == 3
delay 2
txreq
rxresp
expect resp.bodylen == 3
} -run
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