RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: h2: partial implementation of h2_detach()

Browse Source 
This does the very minimum required to release a stream and/or a connection
upon the stream's request. The only thing is that it doesn't kill the
connection unless it's already closed or in error or the stream ID reached
the one specified in GOAWAY frame. We're supposed to arm a timer to close
after some idle timeout but it's not done.
This commit is contained in:
Willy Tarreau 2017-10-16 18:11:19 +02:00
parent 61290ec774
commit 6093514933
1 changed files with 30 additions and 0 deletions

30
src/mux_h2.c
View File

@ -1618,6 +1618,36 @@ static void h2_update_poll(struct conn_stream *cs)
*/
static void h2_detach(struct conn_stream *cs)
{
struct h2s *h2s = cs->ctx;
struct h2c *h2c;
cs->ctx = NULL;
if (!h2s)
return;
h2c = h2s->h2c;
h2s->cs = NULL;
if (h2s->by_id.node.leaf_p) {
/* h2s still attached to the h2c */
eb32_delete(&h2s->by_id);
/* We don't want to close right now unless we're removing the
* last stream, and either the connection is in error, or it
* reached the ID already specified in a GOAWAY frame received
* or sent (as seen by last_sid >= 0). A timer should be armed
* to kill the connection after some idle time though.
*/
if (eb_is_empty(&h2c->streams_by_id) &&
(conn_xprt_read0_pending(h2c->conn) ||
(h2c->conn->flags & CO_FL_ERROR) ||
(h2c->flags & H2_CF_GOAWAY_FAILED) ||
(h2c->last_sid >= 0 && h2c->max_id >= h2c->last_sid))) {
/* no more stream will come, kill it now */
h2_release(h2c->conn);
}
}
pool_free2(pool2_h2s, h2s);
}
static void h2_shutr(struct conn_stream *cs, enum cs_shr_mode mode)