Update to haproxy-2.6.5
from brad
This commit is contained in:
danj
parent
1585b16878
commit
78d7d9614b
|
|
@ -1,6 +1,6 @@
|
|||
COMMENT = reliable, high performance TCP/HTTP load balancer
|
||||
|
||||
DISTNAME = haproxy-2.6.4
|
||||
DISTNAME = haproxy-2.6.5
|
||||
CATEGORIES = net www
|
||||
HOMEPAGE = https://www.haproxy.org/
|
||||
MAINTAINER = Daniel Jakots <obsd@chown.me>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (haproxy-2.6.4.tar.gz) = 8H1nraL/Opmf7U40RZwEiVNjMaVJZlrJDLao35H0ook=
|
||||
SIZE (haproxy-2.6.4.tar.gz) = 3986583
|
||||
SHA256 (haproxy-2.6.5.tar.gz) = zp4Z6/zdQ+Ua+KYJDx341RLZct33QvpkimQ7uxkFZgU=
|
||||
SIZE (haproxy-2.6.5.tar.gz) = 4010014
|
||||
|
|
|
|||
|
|
@ -1,115 +0,0 @@
|
|||
Index: src/tcp_sample.c
|
||||
--- src/tcp_sample.c.orig
|
||||
+++ src/tcp_sample.c
|
||||
@@ -357,8 +357,8 @@ static inline int get_tcp_info(const struct arg *args,
|
||||
case 5: smp->data.u.sint = info.tcpi_retrans; break;
|
||||
case 6: smp->data.u.sint = info.tcpi_fackets; break;
|
||||
case 7: smp->data.u.sint = info.tcpi_reordering; break;
|
||||
-# elif defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
- /* the ones are found on FreeBSD and NetBSD featuring TCP_INFO */
|
||||
+# elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+ /* the ones are found on FreeBSD, NetBSD and OpenBSD featuring TCP_INFO */
|
||||
case 2: smp->data.u.sint = info.__tcpi_unacked; break;
|
||||
case 3: smp->data.u.sint = info.__tcpi_sacked; break;
|
||||
case 4: smp->data.u.sint = info.__tcpi_lost; break;
|
||||
@@ -373,7 +373,7 @@ static inline int get_tcp_info(const struct arg *args,
|
||||
return 1;
|
||||
}
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
/* get the mean rtt of a client connection */
|
||||
static int
|
||||
smp_fetch_fc_rtt(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -389,7 +389,7 @@ smp_fetch_fc_rtt(const struct arg *args, struct sample
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
/* get the variance of the mean rtt of a client connection */
|
||||
static int
|
||||
smp_fetch_fc_rttvar(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -406,7 +406,7 @@ smp_fetch_fc_rttvar(const struct arg *args, struct sam
|
||||
#endif
|
||||
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
/* get the unacked counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_unacked(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -417,7 +417,7 @@ smp_fetch_fc_unacked(const struct arg *args, struct sa
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
/* get the sacked counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_sacked(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -428,7 +428,7 @@ smp_fetch_fc_sacked(const struct arg *args, struct sam
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
/* get the lost counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_lost(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -439,7 +439,7 @@ smp_fetch_fc_lost(const struct arg *args, struct sampl
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
/* get the retrans counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_retrans(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -450,7 +450,7 @@ smp_fetch_fc_retrans(const struct arg *args, struct sa
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
/* get the fackets counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_fackets(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -461,7 +461,7 @@ smp_fetch_fc_fackets(const struct arg *args, struct sa
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
/* get the reordering counter on a client connection */
|
||||
static int
|
||||
smp_fetch_fc_reordering(const struct arg *args, struct sample *smp, const char *kw, void *private)
|
||||
@@ -502,22 +502,22 @@ static struct sample_fetch_kw_list sample_fetch_keywor
|
||||
#ifdef TCP_INFO
|
||||
{ "fc_rtt", smp_fetch_fc_rtt, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
{ "fc_rttvar", smp_fetch_fc_rttvar, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
{ "fc_unacked", smp_fetch_fc_unacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
{ "fc_sacked", smp_fetch_fc_sacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
{ "fc_retrans", smp_fetch_fc_retrans, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
{ "fc_fackets", smp_fetch_fc_fackets, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
{ "fc_lost", smp_fetch_fc_lost, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
{ "fc_reordering", smp_fetch_fc_reordering, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
|
||||
#endif
|
||||
#endif // TCP_INFO
|
||||
Loading…
Reference in New Issue
Block a user