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
17ad98cd
Commit
17ad98cd
authored
Mar 04, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
With table-driven MUST handling, some checks become simpler.
parent
c0330b42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
16 deletions
+7
-16
cache_http2_proto.c
bin/varnishd/http2/cache_http2_proto.c
+6
-15
cache_http2_session.c
bin/varnishd/http2/cache_http2_session.c
+1
-1
No files found.
bin/varnishd/http2/cache_http2_proto.c
View file @
17ad98cd
...
...
@@ -223,8 +223,11 @@ static h2_error __match_proto__(h2_frame_f)
h2_rx_rst_stream
(
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
struct
h2_req
*
r2
)
{
(
void
)
wrk
;
(
void
)
h2
;
(
void
)
r2
;
if
(
h2
->
rxf_len
!=
4
)
// rfc7540,l,2003,2004
return
(
H2CE_FRAME_SIZE_ERROR
);
if
(
r2
==
NULL
)
return
(
0
);
INCOMPL
();
NEEDLESS
(
return
(
H2CE_PROTOCOL_ERROR
));
}
...
...
@@ -622,19 +625,7 @@ h2_procframe(struct worker *wrk, struct h2_sess *h2)
if
(
r2
->
stream
==
h2
->
rxf_stream
)
break
;
if
(
h2
->
rxf_type
==
H2_FRAME_RST_STREAM
)
{
/* Special case RST_STREAM to avoid creating streams */
if
(
h2
->
rxf_len
!=
4
)
// rfc7540,l,2003,2004
return
(
H2CE_FRAME_SIZE_ERROR
);
if
(
h2
->
rxf_stream
==
0
)
// rfc7540,l,1993,1996
return
(
H2CE_PROTOCOL_ERROR
);
if
(
h2
->
rxf_stream
>
h2
->
highest_stream
)
// rfc7540,l,1998,2001
return
(
H2CE_PROTOCOL_ERROR
);
if
(
r2
==
NULL
)
return
(
0
);
}
if
(
r2
==
NULL
)
{
if
(
r2
==
NULL
&&
h2f
->
act_sidle
==
0
)
{
if
(
h2
->
rxf_stream
<=
h2
->
highest_stream
)
return
(
H2CE_PROTOCOL_ERROR
);
// rfc7540,l,1153,1158
h2
->
highest_stream
=
h2
->
rxf_stream
;
...
...
bin/varnishd/http2/cache_http2_session.c
View file @
17ad98cd
...
...
@@ -156,7 +156,7 @@ h2_new_req(const struct worker *wrk, struct h2_sess *h2,
}
static
void
h2_del_req
(
struct
worker
*
wrk
,
struct
h2_req
*
r2
)
h2_del_req
(
struct
worker
*
wrk
,
const
struct
h2_req
*
r2
)
{
struct
h2_sess
*
h2
;
struct
sess
*
sp
;
...
...
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