From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 20 Mar 2018 15:09:20 +0000 (+0100)
Subject: BUG/MINOR: spoe: Don't release the context buffer in .check_timeouts callbaclk
X-Git-Tag: v1.9-dev1~321
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac580608d712e1e8c351d84dfda6e5ac773812df;p=thirdparty%2Fhaproxy.git

BUG/MINOR: spoe: Don't release the context buffer in .check_timeouts callbaclk

It is better to let spoe_stop_processing release this buffer because, in
.check_timeouts callback, we lack information to know if it should be release or
not. For instance, if the processing timeout is reached while the SPOE applet
receives the reply, it is preferable to ignore the timeout and process the
result.

This patch should be backported in 1.8.
---

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 9d5b3b88a5..5dba391a00 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -2969,10 +2969,8 @@ spoe_check_timeouts(struct stream *s, struct filter *filter)
 {
 	struct spoe_context *ctx = filter->ctx;
 
-	if (tick_is_expired(ctx->process_exp, now_ms)) {
+	if (tick_is_expired(ctx->process_exp, now_ms))
 		s->pending_events |= TASK_WOKEN_MSG;
-		spoe_release_buffer(&ctx->buffer, &ctx->buffer_wait);
-	}
 }
 
 /* Called when we are ready to filter data on a channel */