Commit b733f9d6 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.7'

parents 36c71468 dc7902ed

changes/bug40620

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay, logging):

    - Demote a harmless XOFF log message to from notice level to info level.

      Fixes bug 40620; bugfix on 0.4.7.5-alpha.

src/core/mainloop/mainloop.c

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ connection_start_reading,(connection_t *conn)) 
    if (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->xoff_received) {

      /* We should not get called here if we're waiting for an XON, but

       * belt-and-suspenders */

      log_notice(LD_NET,

      log_info(LD_NET,

               "Request to start reading on an edgeconn blocked with XOFF");

      return;

    }