git.99rst.org Git - openwrt-packages.git/blob

   1 commit 1526ce4e6f5fb241ca236bd2ac870cdb30e054fd
   2 Author: Christopher Faulet <cfaulet@haproxy.com>
   3 Date:   Tue Apr 23 15:39:32 2019 +0200
   4
   5     BUG/MINOR: spoe: Don't systematically wakeup SPOE stream in the applet handler
   6
   7     This can lead to wakeups in loop between the SPOE stream and the SPOE applets
   8     waiting to receive agent messages (mainly AGENT-HELLO and AGENT-DISCONNECT).
   9
  10     This patch must be backported to 1.9 and 1.8.
  11
  12     (cherry picked from commit 371723b0c2a2e38ae14e1e6f6a7581ef3e2491cf)
  13     Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  14     (cherry picked from commit fe0ccea6bb93406ca0a7339cdf17357b1a283e59)
  15     Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  16
  17 diff --git a/src/flt_spoe.c b/src/flt_spoe.c
  18 index 95f30898..f6109778 100644
  19 --- a/src/flt_spoe.c
  20 +++ b/src/flt_spoe.c
  21 @@ -1929,8 +1929,6 @@ spoe_handle_appctx(struct appctx *appctx)
  22
  23         if (SPOE_APPCTX(appctx)->task->expire != TICK_ETERNITY)
  24                 task_queue(SPOE_APPCTX(appctx)->task);
  25 -       si_oc(si)->flags |= CF_READ_DONTWAIT;
  26 -       task_wakeup(si_strm(si)->task, TASK_WOKEN_IO);
  27  }
  28
  29  struct applet spoe_applet = {