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
9aa45a9f
Commit
9aa45a9f
authored
Nov 16, 2023
by
Dridi Boukelmoune
Committed by
Simon Stridsberg
Mar 18, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http2_proto: Send GOAWAY before leaving the rx loop
parent
05d91fac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
5 deletions
+23
-5
cache_http2_proto.c
bin/varnishd/http2/cache_http2_proto.c
+2
-1
t02003.vtc
bin/varnishtest/tests/t02003.vtc
+14
-2
t02005.vtc
bin/varnishtest/tests/t02005.vtc
+1
-1
t02025.vtc
bin/varnishtest/tests/t02025.vtc
+6
-1
No files found.
bin/varnishd/http2/cache_http2_proto.c
View file @
9aa45a9f
...
...
@@ -412,7 +412,7 @@ h2_tx_goaway(struct worker *wrk, struct h2_sess *h2, h2_error h2e)
ASSERT_RXTHR
(
h2
);
AN
(
h2e
);
if
(
h2
->
goaway
)
if
(
h2
->
goaway
||
!
h2e
->
send_goaway
)
return
;
h2
->
goaway
=
1
;
...
...
@@ -1469,6 +1469,7 @@ h2_rxframe(struct worker *wrk, struct h2_sess *h2)
if
(
h2e
!=
NULL
&&
h2e
->
connection
)
{
h2
->
error
=
h2e
;
h2_tx_goaway
(
wrk
,
h2
,
h2e
);
return
(
0
);
}
...
...
bin/varnishtest/tests/t02003.vtc
View file @
9aa45a9f
...
...
@@ -233,17 +233,28 @@ client c1 {
} -run
client c1 {
stream 0 {
rxgoaway
expect goaway.err == NO_ERROR
expect goaway.laststream == 3
} -start
stream 1 {
txreq -no
hd
rend
txreq -no
st
rend
txrst -err 2
} -run
stream 3 {
txreq -no
hd
rend
txreq -no
st
rend
txrst -err 0x666
} -run
stream 0 -wait
} -run
client c1 {
stream 0 {
rxgoaway
expect goaway.err == NO_ERROR
expect goaway.laststream == 1
} -start
stream 1 {
txreq
rxresp
...
...
@@ -252,6 +263,7 @@ client c1 {
# RST_STREAM on closed stream
txrst
} -run
stream 0 -wait
} -run
...
...
bin/varnishtest/tests/t02005.vtc
View file @
9aa45a9f
...
...
@@ -32,7 +32,7 @@ varnish v1 -cliok "param.set debug +syncvsl"
logexpect l1 -v v1 -g raw {
expect * 1001 ReqAcct "80 7 87 78 8 86"
expect * 1000 ReqAcct "45 8 53
54 20 74
"
expect * 1000 ReqAcct "45 8 53
63 28 91
"
} -start
client c1 {
...
...
bin/varnishtest/tests/t02025.vtc
View file @
9aa45a9f
...
...
@@ -25,12 +25,17 @@ logexpect l1 -v v1 -g raw -i Debug {
} -start
client c1 {
stream 0 {
rxgoaway
expect goaway.err == NO_ERROR
expect goaway.laststream == 1
} -start
stream 1 {
txreq
barrier b1 sync
txrst
} -run
expect_close
stream 0 -wait
} -start
logexpect l1 -wait
...
...
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