diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2019-09-27 15:00:31 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2019-09-27 15:00:31 +0000 |
| commit | 43a6a253378445ab8499a610baf58f8b569a55e8 (patch) | |
| tree | 2ce62375f5f1f3dc89fd080541b63de3428ab1ec /net/haproxy | |
| parent | 0618ded3487dbd9a67f22ddb5e3e4666ee5bb310 (diff) | |
| download | ports-43a6a253378445ab8499a610baf58f8b569a55e8.tar.gz ports-43a6a253378445ab8499a610baf58f8b569a55e8.zip | |
Update to version 2.0.7
Notes
Notes:
svn path=/head/; revision=513038
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/Makefile | 3 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 6 | ||||
| -rw-r--r-- | net/haproxy/files/patch-src-checks.c | 28 |
3 files changed, 4 insertions, 33 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 1db2be2d4389..3021aa6b1f36 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 2.0.6 -PORTREVISION= 1 +DISTVERSION= 2.0.7 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/2.0/src/ diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index fcabaebc2668..d094ab0c5557 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1568377563 -SHA256 (haproxy-2.0.6.tar.gz) = 01e1da09452010111107ca1b3a8b7f1927731ba0fe4380bacae1c626fdc521e4 -SIZE (haproxy-2.0.6.tar.gz) = 2541637 +TIMESTAMP = 1569596238 +SHA256 (haproxy-2.0.7.tar.gz) = 3873cd72028ed1bd2506dd174e01a92620e92683092f34234c96e067dcb113dc +SIZE (haproxy-2.0.7.tar.gz) = 2542573 diff --git a/net/haproxy/files/patch-src-checks.c b/net/haproxy/files/patch-src-checks.c deleted file mode 100644 index cb1a260b8a66..000000000000 --- a/net/haproxy/files/patch-src-checks.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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); |