summaryrefslogtreecommitdiff
path: root/net/haproxy-devel/files
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2015-10-01 11:59:55 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2015-10-01 11:59:55 +0000
commita085710c6d50a33b879b7e46b276240bff727ffe (patch)
tree2651b85b8217f3ad3a7153e2d96496467ca81427 /net/haproxy-devel/files
parentRemove expired port: (diff)
Update to -dev6.
Diffstat (limited to 'net/haproxy-devel/files')
-rw-r--r--net/haproxy-devel/files/patch-src-dns.c11
-rw-r--r--net/haproxy-devel/files/patch-src-proto_tcp.c11
2 files changed, 11 insertions, 11 deletions
diff --git a/net/haproxy-devel/files/patch-src-dns.c b/net/haproxy-devel/files/patch-src-dns.c
deleted file mode 100644
index f06fc22173a0..000000000000
--- a/net/haproxy-devel/files/patch-src-dns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dns.c.orig 2015-09-14 15:41:48.002439000 +0300
-+++ src/dns.c 2015-09-14 15:43:01.499844000 +0300
-@@ -848,7 +848,7 @@ int dns_init_resolvers(void)
- }
-
- /* "connect" the UDP socket to the name server IP */
-- if (connect(fd, (struct sockaddr*)&curnameserver->addr, sizeof(curnameserver->addr)) == -1) {
-+ if (connect(fd, (struct sockaddr*)&curnameserver->addr, get_addr_len(&curnameserver->addr)) == -1) {
- Alert("Starting [%s/%s] nameserver: can't connect socket.\n", curr_resolvers->id,
- curnameserver->id);
- close(fd);
diff --git a/net/haproxy-devel/files/patch-src-proto_tcp.c b/net/haproxy-devel/files/patch-src-proto_tcp.c
new file mode 100644
index 000000000000..c02093a446e8
--- /dev/null
+++ b/net/haproxy-devel/files/patch-src-proto_tcp.c
@@ -0,0 +1,11 @@
+--- src/proto_tcp.c.orig 2015-10-01 14:53:25.738017000 +0300
++++ src/proto_tcp.c 2015-10-01 14:54:08.222037000 +0300
+@@ -1456,7 +1456,7 @@ static enum act_return tcp_exec_action_s
+ * network and has no effect on local net.
+ */
+ #ifdef IP_TTL
+- setsockopt(conn->t.sock.fd, SOL_IP, IP_TTL, &one, sizeof(one));
++ setsockopt(conn->t.sock.fd, IPPROTO_IP, IP_TTL, &one, sizeof(one));
+ #endif
+ out:
+ /* kill the stream if any */