svn commit: r512201 - in head/net/haproxy: . files
Dmitry Sivachenko
demon at FreeBSD.org
Tue Sep 17 10:04:44 UTC 2019
Author: demon
Date: Tue Sep 17 10:04:43 2019
New Revision: 512201
URL: https://svnweb.freebsd.org/changeset/ports/512201
Log:
Add a patch from upstream to fix checks.
PR: 240627
Submitted by: nbari
Added:
head/net/haproxy/files/patch-src-checks.c (contents, props changed)
Modified:
head/net/haproxy/Makefile
Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile Tue Sep 17 09:38:18 2019 (r512200)
+++ head/net/haproxy/Makefile Tue Sep 17 10:04:43 2019 (r512201)
@@ -3,6 +3,7 @@
PORTNAME= haproxy
DISTVERSION= 2.0.6
+PORTREVISION= 1
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/2.0/src/
Added: head/net/haproxy/files/patch-src-checks.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/haproxy/files/patch-src-checks.c Tue Sep 17 10:04:43 2019 (r512201)
@@ -0,0 +1,28 @@
+--- src/checks.c.orig 2019-09-17 10:00:12.658926000 +0000
++++ src/checks.c 2019-09-17 10:02:03.978010000 +0000
+@@ -1447,12 +1447,8 @@ static int wake_srv_chk(struct conn_stream *cs)
+ ret = tcpcheck_main(check);
+ cs = check->cs;
+ conn = cs->conn;
+- } else {
+- if (!(check->wait_list.events & SUB_RETRY_SEND))
+- __event_srv_chk_w(cs);
+- if (!(check->wait_list.events & SUB_RETRY_RECV))
+- __event_srv_chk_r(cs);
+- }
++ } else if (!(check->wait_list.events & SUB_RETRY_SEND))
++ __event_srv_chk_w(cs);
+
+ if (unlikely(conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR)) {
+ /* We may get error reports bypassing the I/O handlers, typically
+@@ -2262,9 +2258,7 @@ static struct task *process_chk_conn(struct task *t, v
+ * sending since otherwise we won't be woken up.
+ */
+ __event_srv_chk_w(cs);
+- if (!(conn->flags & CO_FL_WAIT_L4_CONN) ||
+- !(check->wait_list.events & SUB_RETRY_SEND))
+- __event_srv_chk_r(cs);
++ __event_srv_chk_r(cs);
+ }
+
+ task_set_affinity(t, tid_bit);
More information about the svn-ports-head
mailing list