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
a1c641c3
Commit
a1c641c3
authored
May 30, 2018
by
Dag Haavi Finstad
Committed by
Dridi Boukelmoune
Jun 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass an h2_req arg to h2_tx_rst
parent
1b9c650d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
27 deletions
+28
-27
cache_http2_proto.c
bin/varnishd/http2/cache_http2_proto.c
+28
-27
No files found.
bin/varnishd/http2/cache_http2_proto.c
View file @
a1c641c3
...
...
@@ -130,6 +130,31 @@ h2_connectionerror(uint32_t u)
return
(
H2NN_ERROR
);
}
/**********************************************************************/
static
h2_error
h2_tx_rst
(
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
struct
h2_req
*
r2
,
uint32_t
stream
,
h2_error
h2e
)
{
h2_error
ret
;
char
b
[
4
];
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
r2
,
H2_REQ_MAGIC
);
Lck_Lock
(
&
h2
->
sess
->
mtx
);
VSLb
(
h2
->
vsl
,
SLT_Debug
,
"H2: stream %u: %s"
,
stream
,
h2e
->
txt
);
Lck_Unlock
(
&
h2
->
sess
->
mtx
);
vbe32enc
(
b
,
h2e
->
val
);
H2_Send_Get
(
wrk
,
h2
,
r2
);
ret
=
H2_Send_Frame
(
wrk
,
h2
,
H2_F_RST_STREAM
,
0
,
sizeof
b
,
stream
,
b
);
H2_Send_Rel
(
h2
,
r2
);
return
(
ret
);
}
/**********************************************************************
*/
...
...
@@ -840,30 +865,6 @@ h2_frame_complete(struct http_conn *htc)
/**********************************************************************/
static
h2_error
h2_tx_rst
(
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
uint32_t
stream
,
h2_error
h2e
)
{
h2_error
ret
;
char
b
[
4
];
CHECK_OBJ_NOTNULL
(
h2
,
H2_SESS_MAGIC
);
Lck_Lock
(
&
h2
->
sess
->
mtx
);
VSLb
(
h2
->
vsl
,
SLT_Debug
,
"H2: stream %u: %s"
,
stream
,
h2e
->
txt
);
Lck_Unlock
(
&
h2
->
sess
->
mtx
);
vbe32enc
(
b
,
h2e
->
val
);
H2_Send_Get
(
wrk
,
h2
,
h2
->
req0
);
ret
=
H2_Send_Frame
(
wrk
,
h2
,
H2_F_RST_STREAM
,
0
,
sizeof
b
,
stream
,
b
);
H2_Send_Rel
(
h2
,
h2
->
req0
);
return
(
ret
);
}
/**********************************************************************/
static
h2_error
h2_procframe
(
struct
worker
*
wrk
,
struct
h2_sess
*
h2
,
h2_frame
h2f
)
...
...
@@ -904,7 +905,7 @@ h2_procframe(struct worker *wrk, struct h2_sess *h2,
"H2: stream %u: Hit maximum number of "
"concurrent streams"
,
h2
->
rxf_stream
);
// rfc7540,l,1200,1205
return
(
h2_tx_rst
(
wrk
,
h2
,
h2
->
rxf_stream
,
return
(
h2_tx_rst
(
wrk
,
h2
,
h2
->
r
eq0
,
h2
->
r
xf_stream
,
H2SE_REFUSED_STREAM
));
}
h2
->
highest_stream
=
h2
->
rxf_stream
;
...
...
@@ -922,7 +923,7 @@ h2_procframe(struct worker *wrk, struct h2_sess *h2,
if
(
h2
->
rxf_stream
==
0
||
h2e
->
connection
)
return
(
h2e
);
// Connection errors one level up
return
(
h2_tx_rst
(
wrk
,
h2
,
h2
->
rxf_stream
,
h2e
));
return
(
h2_tx_rst
(
wrk
,
h2
,
h2
->
r
eq0
,
h2
->
r
xf_stream
,
h2e
));
}
static
int
...
...
@@ -982,7 +983,7 @@ h2_sweep(struct worker *wrk, struct h2_sess *h2)
break
;
case
H2_S_CLOS_REM
:
if
(
!
r2
->
scheduled
)
{
h2_tx_rst
(
wrk
,
h2
,
r2
->
stream
,
h2_tx_rst
(
wrk
,
h2
,
h2
->
req0
,
r2
->
stream
,
H2SE_REFUSED_STREAM
);
h2_del_req
(
wrk
,
r2
);
continue
;
...
...
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