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
1252ddf2
Commit
1252ddf2
authored
Jun 17, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor polishing
parent
d1241323
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+10
-6
No files found.
bin/varnishd/cache/cache_fetch.c
View file @
1252ddf2
...
...
@@ -474,7 +474,7 @@ vbf_fetch_hdr(struct worker *wrk, struct busyobj *bo, struct req *req)
*/
static
void
vbf_fetch_body
(
struct
worker
*
wrk
,
void
*
priv
)
vbf_fetch_body
(
struct
worker
*
wrk
,
struct
busyobj
*
bo
)
{
int
cls
;
struct
storage
*
st
;
...
...
@@ -482,10 +482,9 @@ vbf_fetch_body(struct worker *wrk, void *priv)
ssize_t
cl
;
struct
http_conn
*
htc
;
struct
object
*
obj
;
struct
busyobj
*
bo
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
C
AST_OBJ_NOTNULL
(
bo
,
priv
,
BUSYOBJ_MAGIC
);
C
HECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
htc
=
&
bo
->
htc
;
CHECK_OBJ_ORNULL
(
bo
->
vbc
,
VBC_MAGIC
);
obj
=
bo
->
fetch_obj
;
...
...
@@ -661,6 +660,7 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo, const struct req *req)
http_PrintfHeader
(
bo
->
bereq
,
"X-Varnish: %u"
,
bo
->
vsl
->
wid
&
VSL_IDENTMASK
);
/* XXX: Missing ABANDON */
return
(
F_STP_FETCHHDR
);
}
/*--------------------------------------------------------------------
...
...
@@ -801,9 +801,10 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo, struct req **reqp)
else
if
(
bo
->
is_gzip
)
bo
->
vfp
=
&
vfp_testgzip
;
if
(
wrk
->
handling
!=
VCL_RET_DELIVER
)
return
(
F_STP_NOTYET
);
return
(
F_STP_FETCH
);
if
(
wrk
->
handling
==
VCL_RET_DELIVER
)
return
(
F_STP_FETCH
);
return
(
F_STP_NOTYET
);
}
/*--------------------------------------------------------------------
...
...
@@ -824,6 +825,8 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
assert
(
wrk
->
handling
==
VCL_RET_DELIVER
);
#if 0
if (wrk->handling != VCL_RET_DELIVER)
VDI_CloseFd(&bo->vbc);
...
...
@@ -853,6 +856,7 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
WRONG("Illegal action in vcl_fetch{}");
}
}
#endif
if
(
bo
->
fetch_objcore
->
objhead
==
NULL
)
AN
(
bo
->
do_pass
);
...
...
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