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
57941abf
Commit
57941abf
authored
Dec 27, 2018
by
Federico G. Schwindt
Committed by
Dridi Boukelmoune
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Permit subsequent conditional requests on 304
Fixes #2871.
parent
e03d6c43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+2
-1
b00039.vtc
bin/varnishtest/tests/b00039.vtc
+13
-0
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
57941abf
...
...
@@ -714,7 +714,8 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
OA_ESIDATA
));
AZ
(
ObjCopyAttr
(
bo
->
wrk
,
bo
->
fetch_objcore
,
bo
->
stale_oc
,
OA_FLAGS
));
ObjSetFlag
(
bo
->
wrk
,
bo
->
fetch_objcore
,
OF_IMSCAND
,
0
);
if
(
bo
->
fetch_objcore
->
flags
&
OC_F_HFM
)
ObjSetFlag
(
bo
->
wrk
,
bo
->
fetch_objcore
,
OF_IMSCAND
,
0
);
AZ
(
ObjCopyAttr
(
bo
->
wrk
,
bo
->
fetch_objcore
,
bo
->
stale_oc
,
OA_GZIPBITS
));
if
(
bo
->
do_stream
)
{
...
...
bin/varnishtest/tests/b00039.vtc
View file @
57941abf
...
...
@@ -6,6 +6,9 @@ server s1 {
rxreq
expect req.http.if-modified-since == "Wed, 11 Sep 2013 13:36:55 GMT"
txresp -status 304
rxreq
expect req.http.if-modified-since == "Wed, 11 Sep 2013 13:36:55 GMT"
txresp -status 304
} -start
varnish v1 -vcl+backend {
...
...
@@ -44,3 +47,13 @@ client c1 {
expect resp.body == "Geoff Rules"
expect resp.http.was-304 == "true"
} -run
delay 1
client c1 {
txreq
rxresp
expect resp.status == 200
expect resp.body == "Geoff Rules"
expect resp.http.was-304 == "true"
} -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