From: Willy Tarreau <wtarreau@exceliance.fr>
Date: Mon, 20 Aug 2012 18:21:01 +0000 (+0200)
Subject: MAJOR: raw_sock: temporarily disable splicing
X-Git-Tag: v1.5-dev12~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af978c4170f7fe3dfcccca6ee73103b95c0ca316;p=thirdparty%2Fhaproxy.git

MAJOR: raw_sock: temporarily disable splicing

It's too hard to convert splicing to connection+buf for now, so let's disable
it in order to make progress.
---

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 2c96cbbce2..f5b5f2f1d3 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -46,7 +46,7 @@
 static void sock_raw_read(struct connection *conn);
 
 
-#if defined(CONFIG_HAP_LINUX_SPLICE)
+#if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
 #include <common/splice.h>
 
 /* A pipe contains 16 segments max, and it's common to see segments of 1448 bytes
@@ -312,7 +312,7 @@ static void sock_raw_read(struct connection *conn)
 	if (b->flags & BF_SHUTR)
 		return;
 
-#if defined(CONFIG_HAP_LINUX_SPLICE)
+#if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
 	if (b->to_forward >= MIN_SPLICE_FORWARD && b->flags & BF_KERN_SPLICING) {
 
 		/* Under Linux, if FD_POLL_HUP is set, we have reached the end.
@@ -490,7 +490,7 @@ static int sock_raw_write_loop(struct connection *conn)
 	int write_poll = MAX_WRITE_POLL_LOOPS;
 	int ret, max;
 
-#if defined(CONFIG_HAP_LINUX_SPLICE)
+#if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
 	while (b->pipe) {
 		ret = splice(b->pipe->cons, NULL, si_fd(si), NULL, b->pipe->data,
 			     SPLICE_F_MOVE|SPLICE_F_NONBLOCK);