From: Willy Tarreau Date: Wed, 20 Sep 2017 15:46:46 +0000 (+0200) Subject: MINOR: connection: adjust CO_FL_NOTIFY_DATA after removal of flags X-Git-Tag: v1.8-dev3~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82967bf9;p=thirdparty%2Fhaproxy.git MINOR: connection: adjust CO_FL_NOTIFY_DATA after removal of flags After the removal of CO_FL_DATA_RD_SH and CO_FL_DATA_WR_SH, the aggregate mask CO_FL_NOTIFY_DATA was not updated. It happens that now CO_FL_NOTIFY_DATA and CO_FL_NOTIFY_DONE are similar, which may reveal some overlap between the ->wake and ->xprt_done callbacks. We'll see after the mux changes if both are still required. --- diff --git a/include/types/connection.h b/include/types/connection.h index 9724b2ce6b..9e256958ef 100644 --- a/include/types/connection.h +++ b/include/types/connection.h @@ -107,7 +107,7 @@ enum { /* flags used to report connection errors or other closing conditions */ CO_FL_ERROR = 0x00100000, /* a fatal error was reported */ CO_FL_NOTIFY_DONE = 0x001C0000, /* any xprt shut/error flags above needs to be reported */ - CO_FL_NOTIFY_DATA = 0x001F0000, /* any shut/error flags above needs to be reported */ + CO_FL_NOTIFY_DATA = 0x001C0000, /* any shut/error flags above needs to be reported */ /* flags used to report connection status updates */ CO_FL_CONNECTED = 0x00200000, /* L4+L6 now ready ; extra handshakes may or may not exist */