Hi Willy, Am 11.03.2017 um 14:13 schrieb Willy Tarreau: > > OK so this is the one that I initially suspected and that after you > reverted, didn't fix the issue for you. > > Are you sure you didn't have a problem when you reverted it ? (eg: > failed to restart the process or something like this). > > At least now we're certain it's this one so we can try to imagine > any possible corner case or any remaining bug this one could have > uncovered.
I tested it again with the patch and I get the result: patch -Rp1 </home/idefix/0001-BUG-MEDIUM-tcp-don-t-poll-for-write-when-connect-suc.patch ... |--- | src/proto_tcp.c | 30 +++++++++++++++++++++++++----- | 1 file changed, 25 insertions(+), 5 deletions(-) | |diff --git a/src/proto_tcp.c b/src/proto_tcp.c |index f6d8ca1..c04f276 100644 |--- a/src/proto_tcp.c |+++ b/src/proto_tcp.c -------------------------- Patching file src/proto_tcp.c using Plan A... Hunk #1 failed at 474. Hunk #2 failed at 514. Hunk #3 failed at 523. Hunk #4 failed at 531. 4 out of 4 hunks failed--saving rejects to src/proto_tcp.c.rej Hmm... Ignoring the trailing garbage. done What I understand from the output is that the revert got rejected in src/proto_tcp.c. So that explains why the test failed. I checked the port again and there is one patch applied to haproxy, but it is a different file, so it should not cause the patch to fail, but maybe can cause other problems. --- src/hlua_fcn.c.orig 2016-12-17 13:58:44.786067000 +0300 +++ src/hlua_fcn.c 2016-12-17 13:59:17.551256000 +0300 @@ -39,6 +39,12 @@ static int class_listener_ref; #define STATS_LEN (MAX((int)ST_F_TOTAL_FIELDS, (int)INF_TOTAL_FIELDS)) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#define s6_addr8 __u6_addr.__u6_addr8 +#define s6_addr16 __u6_addr.__u6_addr16 +#define s6_addr32 __u6_addr.__u6_addr32 +#endif + static struct field stats[STATS_LEN]; int hlua_checkboolean(lua_State *L, int index) Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook
