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
9552aa16
Commit
9552aa16
authored
May 05, 2016
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retire fetch return option from vcl_hit{}
This has been superseded by return (miss).
parent
dce6eccd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+0
-4
r01335.vtc
bin/varnishtest/tests/r01335.vtc
+1
-1
generate.py
lib/libvcc/generate.py
+1
-1
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
9552aa16
...
@@ -439,10 +439,6 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -439,10 +439,6 @@ cnt_lookup(struct worker *wrk, struct req *req)
req
->
is_hit
=
1
;
req
->
is_hit
=
1
;
req
->
req_step
=
R_STP_DELIVER
;
req
->
req_step
=
R_STP_DELIVER
;
return
(
REQ_FSM_MORE
);
return
(
REQ_FSM_MORE
);
case
VCL_RET_FETCH
:
VSLb
(
req
->
vsl
,
SLT_VCL_Error
,
"change return(fetch) to return(miss) in vcl_hit{}"
);
/* FALL-THROUGH */
case
VCL_RET_MISS
:
case
VCL_RET_MISS
:
if
(
busy
!=
NULL
)
{
if
(
busy
!=
NULL
)
{
req
->
objcore
=
busy
;
req
->
objcore
=
busy
;
...
...
bin/varnishtest/tests/r01335.vtc
View file @
9552aa16
...
@@ -10,7 +10,7 @@ server s1 {
...
@@ -10,7 +10,7 @@ server s1 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
sub vcl_hit {
sub vcl_hit {
if (req.http.two == "2") {
if (req.http.two == "2") {
return (
fetch
); // also #1603
return (
miss
); // also #1603
}
}
}
}
} -start
} -start
...
...
lib/libvcc/generate.py
View file @
9552aa16
...
@@ -109,7 +109,7 @@ returns =(
...
@@ -109,7 +109,7 @@ returns =(
),
),
(
'hit'
,
(
'hit'
,
"C"
,
"C"
,
(
'synth'
,
'restart'
,
'pass'
,
'
fetch'
,
'
miss'
,
'deliver'
,)
(
'synth'
,
'restart'
,
'pass'
,
'miss'
,
'deliver'
,)
),
),
(
'deliver'
,
(
'deliver'
,
"C"
,
"C"
,
...
...
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