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
51ab3f20
Commit
51ab3f20
authored
Mar 03, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Collapse two fetch states and make the X-Varnish heading for the backend
available in vcl_backend_fetch{}
parent
9dbe0ec2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
20 deletions
+4
-20
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+4
-19
steps.h
include/tbl/steps.h
+0
-1
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
51ab3f20
...
...
@@ -265,6 +265,7 @@ vbf_stp_retry(struct worker *wrk, struct busyobj *bo)
static
enum
fetch_step
vbf_stp_startfetch
(
struct
worker
*
wrk
,
struct
busyobj
*
bo
)
{
int
i
,
do_ims
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
...
...
@@ -277,12 +278,12 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
HTTP_Setup
(
bo
->
bereq
,
bo
->
ws
,
bo
->
vsl
,
SLT_BereqMethod
);
HTTP_Copy
(
bo
->
bereq
,
bo
->
bereq0
);
http_PrintfHeader
(
bo
->
bereq
,
"X-Varnish: %u"
,
bo
->
vsl
->
wid
&
VSL_IDENTMASK
);
VCL_backend_fetch_method
(
bo
->
vcl
,
wrk
,
NULL
,
bo
,
bo
->
bereq
->
ws
);
bo
->
uncacheable
=
bo
->
do_pass
;
http_PrintfHeader
(
bo
->
bereq
,
"X-Varnish: %u"
,
bo
->
vsl
->
wid
&
VSL_IDENTMASK
);
if
(
wrk
->
handling
==
VCL_RET_ABANDON
)
{
if
(
bo
->
req
!=
NULL
)
vbf_release_req
(
bo
);
...
...
@@ -291,22 +292,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
return
(
F_STP_DONE
);
}
assert
(
wrk
->
handling
==
VCL_RET_FETCH
);
return
(
F_STP_FETCHHDR
);
}
/*--------------------------------------------------------------------
*/
static
enum
fetch_step
vbf_stp_fetchhdr
(
struct
worker
*
wrk
,
struct
busyobj
*
bo
)
{
int
i
,
do_ims
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
xxxassert
(
wrk
->
handling
==
VCL_RET_FETCH
);
HTTP_Setup
(
bo
->
beresp
,
bo
->
ws
,
bo
->
vsl
,
SLT_BerespMethod
);
...
...
include/tbl/steps.h
View file @
51ab3f20
...
...
@@ -52,7 +52,6 @@ REQ_STEP(error, ERROR, (wrk, req))
FETCH_STEP
(
mkbereq
,
MKBEREQ
,
(
wrk
,
bo
))
FETCH_STEP
(
retry
,
RETRY
,
(
wrk
,
bo
))
FETCH_STEP
(
startfetch
,
STARTFETCH
,
(
wrk
,
bo
))
FETCH_STEP
(
fetchhdr
,
FETCHHDR
,
(
wrk
,
bo
))
FETCH_STEP
(
condfetch
,
CONDFETCH
,
(
wrk
,
bo
))
FETCH_STEP
(
fetch
,
FETCH
,
(
wrk
,
bo
))
FETCH_STEP
(
error
,
ERROR
,
(
wrk
,
bo
))
...
...
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