RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: h2: don't close the connection is there are data left

Browse Source 
h2_detach() is called after a stream was closed, and it evaluates if it's
worth closing the connection. The issue there is that the connection is
closed too early in case there's demand for closing after the last stream,
even if some data remain in the mux. Let's change the condition to check
for this.
This commit is contained in:
Willy Tarreau 2017-11-07 11:48:46 +01:00
parent f5d79ac5a8
commit 83906c2f91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mux_h2.c
View File

@ -2210,11 +2210,12 @@ static void h2_detach(struct conn_stream *cs)
* 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) ||
if (eb_is_empty(&h2c->streams_by_id) && /* don't close if streams exist */
((h2c->conn->flags & CO_FL_ERROR) || /* errors close immediately */
(h2c->flags & H2_CF_GOAWAY_FAILED) ||
(h2c->last_sid >= 0 && h2c->max_id >= h2c->last_sid))) {
(!h2c->mbuf->o && /* mux buffer empty, also process clean events below */
(conn_xprt_read0_pending(h2c->conn) ||
(h2c->last_sid >= 0 && h2c->max_id >= h2c->last_sid))))) {
/* no more stream will come, kill it now */
h2_release(h2c->conn);
}