haproxy: add pending patches from upstream
[feed/packages.git] / net / haproxy / patches / 0011-BUG-MEDIUM-peers-table-entries-learned-from-a-remote.patch
1 From 96a1b4a969a5f3c9224d786c79e90d15a47094b0 Mon Sep 17 00:00:00 2001
2 From: Emeric Brun <ebrun@haproxy.com>
3 Date: Wed, 16 Dec 2015 15:16:46 +0100
4 Subject: [PATCH 11/13] BUG/MEDIUM: peers: table entries learned from a remote
5 are pushed to others after a random delay.
6
7 New sticktable entries learned from a remote peer can be pushed to others after
8 a random delay because they are not inserted at the right position in the updates
9 tree.
10 (cherry picked from commit 234fc3c31e751f8191b9b78fa5fd16663c2627fe)
11 (cherry picked from commit 8b1a697362977b8392caca3efaf97a5a8a8c782b)
12 ---
13 src/peers.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/src/peers.c b/src/peers.c
17 index 0564d3d..92b4df0 100644
18 --- a/src/peers.c
19 +++ b/src/peers.c
20 @@ -720,7 +720,7 @@ switchstate:
21 ts = stktable_store(ps->table->table, newts, 0);
22 newts = NULL; /* don't reuse it */
23
24 - ts->upd.key= (++ps->table->table->update)+(2^31);
25 + ts->upd.key= (++ps->table->table->update)+(2147483648U);
26 eb = eb32_insert(&ps->table->table->updates, &ts->upd);
27 if (eb != &ts->upd) {
28 eb32_delete(eb);
29 --
30 2.4.10
31