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
b07804bf
Commit
b07804bf
authored
Feb 17, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
bb2765dc
84b7dda8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
18 deletions
+15
-18
cache_center.c
bin/varnishd/cache_center.c
+2
-5
default.vcl
bin/varnishd/default.vcl
+8
-8
c00011.vtc
bin/varnishtest/tests/c00011.vtc
+1
-1
c00014.vtc
bin/varnishtest/tests/c00014.vtc
+1
-1
e00011.vtc
bin/varnishtest/tests/e00011.vtc
+1
-1
r00318.vtc
bin/varnishtest/tests/r00318.vtc
+1
-1
generate.py
lib/libvcl/generate.py
+1
-1
No files found.
bin/varnishd/cache_center.c
View file @
b07804bf
...
...
@@ -566,14 +566,11 @@ cnt_fetch(struct sess *sp)
pass
=
1
;
/* VCL may have fiddled this, but that doesn't help */
sp
->
wrk
->
ttl
=
sp
->
t_req
-
1
.;
}
else
if
(
sp
->
handling
==
VCL_RET_PASS
)
{
}
else
if
(
sp
->
handling
==
VCL_RET_
HIT_FOR_
PASS
)
{
/* pass from vcl_fetch{} -> hit-for-pass */
/* XXX: the bereq was not filtered pass... */
pass
=
1
;
sp
->
objcore
->
flags
|=
OC_F_PASS
;
/* Enforce a minimum TTL of 1 sec (if set from VCL) */
if
(
sp
->
wrk
->
ttl
<=
sp
->
t_req
)
sp
->
wrk
->
ttl
=
sp
->
wrk
->
entered
+
params
->
default_ttl
;
}
else
{
/* regular object */
pass
=
0
;
...
...
@@ -728,7 +725,7 @@ cnt_fetch(struct sess *sp)
sp
->
restarts
++
;
sp
->
step
=
STP_RECV
;
return
(
0
);
case
VCL_RET_PASS
:
case
VCL_RET_
HIT_FOR_
PASS
:
case
VCL_RET_DELIVER
:
break
;
case
VCL_RET_ERROR
:
...
...
bin/varnishd/default.vcl
View file @
b07804bf
...
...
@@ -102,14 +102,14 @@ sub vcl_miss {
}
sub vcl_fetch {
if (beresp.ttl
<
=
0s
)
{
return
(
pass
);
}
if
(
beresp
.
http
.
Set-Cookie
)
{
return
(
pass
);
}
if
(
beresp
.
http
.
Vary =
=
"*")
{
return
(
pass
);
if (beresp.ttl
<
=
0s
||
beresp
.
http
.
Set-Cookie
||
beresp
.
http
.
Vary =
=
"*")
{
/*
*
Mark
as
"
Hit-For-Pass
"
for
the
next
2
minutes
*/
set
beresp
.
ttl =
120
s
;
return
(
hit_for_
pass
);
}
return
(
deliver
);
}
...
...
bin/varnishtest/tests/c00011.vtc
View file @
b07804bf
...
...
@@ -13,7 +13,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_fetch {
return(pass);
return(
hit_for_
pass);
}
} -start
...
...
bin/varnishtest/tests/c00014.vtc
View file @
b07804bf
...
...
@@ -17,7 +17,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_fetch {
return(pass);
return(
hit_for_
pass);
}
} -start
...
...
bin/varnishtest/tests/e00011.vtc
View file @
b07804bf
...
...
@@ -20,7 +20,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_fetch {
set beresp.do_esi = true;
return(pass);
return(
hit_for_
pass);
}
} -start
...
...
bin/varnishtest/tests/r00318.vtc
View file @
b07804bf
...
...
@@ -10,7 +10,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_fetch {
set beresp.do_esi = true;
return(pass);
return(
hit_for_
pass);
}
} -start
...
...
lib/libvcl/generate.py
View file @
b07804bf
...
...
@@ -91,7 +91,7 @@ returns =(
(
'hash'
,
(
'hash'
,)),
(
'miss'
,
(
'error'
,
'restart'
,
'pass'
,
'fetch'
,)),
(
'hit'
,
(
'error'
,
'restart'
,
'pass'
,
'deliver'
,)),
(
'fetch'
,
(
'error'
,
'restart'
,
'pass'
,
'deliver'
,)),
(
'fetch'
,
(
'error'
,
'restart'
,
'
hit_for_
pass'
,
'deliver'
,)),
(
'deliver'
,
(
'restart'
,
'deliver'
,)),
(
'error'
,
(
'restart'
,
'deliver'
,)),
)
...
...
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