Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent3
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
varnishevent3
Commits
6cd23c2a
Commit
6cd23c2a
authored
Mar 14, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix HEAD requests with ESI processing: Only call vfp->end if we
called vfp->begin. Fixes: #871, #870
parent
c3c23079
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletion
+31
-1
cache_fetch.c
bin/varnishd/cache_fetch.c
+4
-1
e00027.vtc
bin/varnishtest/tests/e00027.vtc
+27
-0
No files found.
bin/varnishd/cache_fetch.c
View file @
6cd23c2a
...
...
@@ -514,14 +514,17 @@ FetchBody(struct sess *sp)
cls
=
fetch_straight
(
sp
,
sp
->
wrk
->
htc
,
sp
->
wrk
->
h_content_length
);
mklen
=
1
;
XXXAZ
(
sp
->
wrk
->
vfp
->
end
(
sp
));
break
;
case
BS_CHUNKED
:
cls
=
fetch_chunked
(
sp
,
sp
->
wrk
->
htc
);
mklen
=
1
;
XXXAZ
(
sp
->
wrk
->
vfp
->
end
(
sp
));
break
;
case
BS_EOF
:
cls
=
fetch_eof
(
sp
,
sp
->
wrk
->
htc
);
mklen
=
1
;
XXXAZ
(
sp
->
wrk
->
vfp
->
end
(
sp
));
break
;
case
BS_ERROR
:
cls
=
1
;
...
...
@@ -532,8 +535,8 @@ FetchBody(struct sess *sp)
mklen
=
0
;
INCOMPL
();
}
XXXAZ
(
sp
->
wrk
->
vfp
->
end
(
sp
));
AZ
(
sp
->
wrk
->
vgz_rx
);
/*
* It is OK for ->end to just leave the last storage segment
* sitting on sp->wrk->storage, we will always call vfp_nop_end()
...
...
bin/varnishtest/tests/e00027.vtc
0 → 100644
View file @
6cd23c2a
# $Id$
test "test HEAD against ESI processing"
server s1 {
rxreq
expect req.url == "/1"
txresp -bodylen 1
} -start
varnish v1 -vcl+backend {
sub vcl_fetch {
set beresp.do_esi = true;
}
} -start
client c1 {
txreq -url "/1"
rxresp
expect resp.status == 200
expect resp.bodylen == 1
txreq -req "HEAD" -url "/1"
rxresp -no_obj
expect resp.status == 200
} -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