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
3b74d51c
Commit
3b74d51c
authored
Dec 17, 2020
by
Martin Blix Grydeland
Committed by
Dridi Boukelmoune
Jan 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vsl: Also skip sessions for request grouping
parent
fd76408f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
vsl_dispatch.c
lib/libvarnishapi/vsl_dispatch.c
+14
-10
No files found.
lib/libvarnishapi/vsl_dispatch.c
View file @
3b74d51c
...
...
@@ -1290,27 +1290,31 @@ vslq_candidate(struct VSLQ *vslq, const uint32_t *ptr)
AN
(
ptr
);
assert
(
vslq
->
grouping
!=
VSL_g_raw
);
if
(
vslq
->
grouping
!=
VSL_g_vxid
)
return
(
1
);
if
(
vslq
->
grouping
==
VSL_g_session
)
return
(
1
);
/* All are needed */
vsl
=
vslq
->
vsl
;
CHECK_OBJ_NOTNULL
(
vsl
,
VSL_MAGIC
);
if
(
!
vsl
->
c_opt
&&
!
vsl
->
b_opt
)
return
(
1
);
if
(
vslq
->
grouping
==
VSL_g_vxid
)
{
if
(
!
vsl
->
c_opt
&&
!
vsl
->
b_opt
)
return
(
1
);
/* Implies also !vsl->E_opt */
if
(
!
vsl
->
b_opt
&&
!
VSL_CLIENT
(
ptr
))
return
(
0
);
if
(
!
vsl
->
c_opt
&&
!
VSL_BACKEND
(
ptr
))
return
(
0
);
/* Need to parse the Begin tag - fallthrough to below */
}
tag
=
VSL_TAG
(
ptr
);
assert
(
tag
==
SLT_Begin
);
i
=
vtx_parse_link
(
VSL_CDATA
(
ptr
),
&
type
,
&
p_vxid
,
&
reason
);
if
(
i
!=
3
||
type
==
VSL_t_unknown
)
return
(
0
);
if
(
vsl
->
c_opt
&&
!
vsl
->
b_opt
&&
!
VSL_CLIENT
(
ptr
))
return
(
0
);
if
(
vsl
->
b_opt
&&
!
vsl
->
c_opt
&&
!
VSL_BACKEND
(
ptr
))
return
(
0
);
if
(
type
==
VSL_t_sess
)
return
(
0
);
if
(
reason
==
VSL_r_esi
&&
!
vsl
->
E_opt
)
if
(
vslq
->
grouping
==
VSL_g_vxid
&&
reason
==
VSL_r_esi
&&
!
vsl
->
E_opt
)
return
(
0
);
return
(
1
);
...
...
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