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
d12625f3
Commit
d12625f3
authored
Feb 23, 2016
by
Martin Blix Grydeland
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not set the oa_present bit when ObjSetAttr returns failure
parent
ef95a084
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
cache_expire.c
bin/varnishd/cache/cache_expire.c
+1
-1
cache_obj.c
bin/varnishd/cache/cache_obj.c
+5
-2
No files found.
bin/varnishd/cache/cache_expire.c
View file @
d12625f3
...
@@ -180,7 +180,7 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, unsigned flags)
...
@@ -180,7 +180,7 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, unsigned flags)
oc
->
timer_when
,
oc
->
flags
);
oc
->
timer_when
,
oc
->
flags
);
if
(
oc
->
flags
&
OC_F_DYING
)
{
if
(
oc
->
flags
&
OC_F_DYING
)
{
oc
->
exp_flags
&=
OC_EF_EXP
;
oc
->
exp_flags
&=
~
OC_EF_EXP
;
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_Kill p=%p e=%.9f f=0x%x"
,
oc
,
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_Kill p=%p e=%.9f f=0x%x"
,
oc
,
oc
->
timer_when
,
oc
->
flags
);
oc
->
timer_when
,
oc
->
flags
);
if
(
!
(
flags
&
OC_EF_INSERT
))
{
if
(
!
(
flags
&
OC_EF_INSERT
))
{
...
...
bin/varnishd/cache/cache_obj.c
View file @
d12625f3
...
@@ -414,14 +414,17 @@ ObjSetAttr(struct worker *wrk, struct objcore *oc, enum obj_attr attr,
...
@@ -414,14 +414,17 @@ ObjSetAttr(struct worker *wrk, struct objcore *oc, enum obj_attr attr,
ssize_t
len
,
const
void
*
ptr
)
ssize_t
len
,
const
void
*
ptr
)
{
{
const
struct
obj_methods
*
om
=
obj_getmethods
(
oc
);
const
struct
obj_methods
*
om
=
obj_getmethods
(
oc
);
void
*
r
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
->
boc
,
BOC_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
->
boc
,
BOC_MAGIC
);
AN
(
om
->
objsetattr
);
AN
(
om
->
objsetattr
);
assert
((
int
)
attr
<
16
);
assert
((
int
)
attr
<
16
);
r
=
om
->
objsetattr
(
wrk
,
oc
,
attr
,
len
,
ptr
);
if
(
r
)
oc
->
oa_present
|=
(
1
<<
attr
);
oc
->
oa_present
|=
(
1
<<
attr
);
return
(
om
->
objsetattr
(
wrk
,
oc
,
attr
,
len
,
ptr
)
);
return
(
r
);
}
}
/*====================================================================
/*====================================================================
...
...
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