]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: h2: handle two extra stream states for errors
authorWilly Tarreau <w@1wt.eu>
Mon, 16 Oct 2017 16:34:34 +0000 (18:34 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 31 Oct 2017 17:03:24 +0000 (18:03 +0100)
We need to deal with stream error notifications (RST_STREAM) as well as
internal reporting. The problem is that we don't know in which order
this will be done so we can't unilaterally decide to deallocate the
stream. In order to help, we add two extra stream states, H2_SS_ERROR
and H2_SS_RESET. The former mentions that the stream has an error pending
and the latter indicates that the error was already sent and that the
stream is now closed. It's equivalent to H2_SS_CLOSED except that in this
state we'll avoid sending new RST_STREAM as per RFC7540#5.4.2.

With this it will be possible to only detach or deallocate the h2s once
the stream is closed.

src/mux_h2.c

index ba3b6af636a6b9533450f845af04bcff12efafe1..9004758f68b5cab9555999db1c10abe0450f7f86 100644 (file)
@@ -87,6 +87,8 @@ enum h2_ss {
        H2_SS_OPEN,     // open
        H2_SS_HREM,     // half-closed(remote)
        H2_SS_HLOC,     // half-closed(local)
+       H2_SS_ERROR,    // an error needs to be sent using RST_STREAM
+       H2_SS_RESET,    // closed after sending RST_STREAM
        H2_SS_CLOSED,   // closed
        H2_SS_ENTRIES   // must be last
 } __attribute__((packed));