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
8bfe8e0d
Commit
8bfe8e0d
authored
Sep 03, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the last oc->oh tests to look at OC_F_PRIVATE instead
parent
d15d4a47
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
cache_busyobj.c
bin/varnishd/cache/cache_busyobj.c
+1
-1
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+5
-4
cache_http1_fetch.c
bin/varnishd/cache/cache_http1_fetch.c
+0
-2
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+1
-1
No files found.
bin/varnishd/cache/cache_busyobj.c
View file @
8bfe8e0d
...
...
@@ -168,7 +168,7 @@ VBO_DerefBusyObj(struct worker *wrk, struct busyobj **pbo)
*
pbo
=
NULL
;
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_ORNULL
(
bo
->
fetch_obj
,
OBJECT_MAGIC
);
if
(
bo
->
fetch_obj
!=
NULL
&&
bo
->
fetch_obj
->
objcore
->
objhead
!=
NULL
)
{
if
(
bo
->
fetch_obj
!=
NULL
)
{
oc
=
bo
->
fetch_obj
->
objcore
;
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
->
objhead
,
OBJHEAD_MAGIC
);
...
...
bin/varnishd/cache/cache_fetch.c
View file @
8bfe8e0d
...
...
@@ -197,8 +197,8 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo)
bo
->
exp
.
entered
=
W_TIM_real
(
wrk
);
RFC2616_Ttl
(
bo
);
/* p
ass from vclrecv{} has
negative TTL */
if
(
bo
->
fetch_objcore
->
objhead
==
NULL
)
/* p
rivate objects have
negative TTL */
if
(
bo
->
fetch_objcore
->
flags
&
OC_F_PRIVATE
)
bo
->
exp
.
ttl
=
-
1
.;
AZ
(
bo
->
do_esi
);
...
...
@@ -299,7 +299,7 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
else
if
(
bo
->
is_gzip
)
bo
->
vfp
=
&
vfp_testgzip
;
if
(
bo
->
fetch_objcore
->
objhead
==
NULL
)
if
(
bo
->
fetch_objcore
->
flags
&
OC_F_PRIVATE
)
AN
(
bo
->
uncacheable
);
/* No reason to try streaming a non-existing body */
...
...
@@ -310,7 +310,7 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
bo
->
uncacheable
?
HTTPH_R_PASS
:
HTTPH_A_INS
,
&
nhttp
);
/* Create Vary instructions */
if
(
bo
->
fetch_objcore
->
objhead
!=
NULL
)
{
if
(
!
(
bo
->
fetch_objcore
->
flags
&
OC_F_PRIVATE
)
)
{
varyl
=
VRY_Create
(
bo
,
&
vary
);
if
(
varyl
>
0
)
{
AN
(
vary
);
...
...
@@ -423,6 +423,7 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
VBO_setstate
(
bo
,
BOS_FETCHING
);
V1F_fetch_body
(
wrk
,
bo
);
HSH_Complete
(
obj
->
objcore
);
assert
(
bo
->
refcount
>=
1
);
...
...
bin/varnishd/cache/cache_http1_fetch.c
View file @
8bfe8e0d
...
...
@@ -447,7 +447,5 @@ V1F_fetch_body(struct worker *wrk, struct busyobj *bo)
"Content-Length: %zd"
,
obj
->
len
);
}
}
if
(
obj
->
objcore
->
objhead
!=
NULL
)
HSH_Complete
(
obj
->
objcore
);
bo
->
stats
=
NULL
;
}
bin/varnishd/cache/cache_req_fsm.c
View file @
8bfe8e0d
...
...
@@ -206,7 +206,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
}
req
->
t_resp
=
W_TIM_real
(
wrk
);
if
(
req
->
obj
->
objcore
->
objhead
!=
NULL
)
{
if
(
!
(
req
->
obj
->
objcore
->
flags
&
OC_F_PRIVATE
)
)
{
if
((
req
->
t_resp
-
req
->
obj
->
last_lru
)
>
cache_param
->
lru_timeout
&&
EXP_Touch
(
req
->
obj
->
objcore
))
...
...
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