From: Willy Tarreau <w@1wt.eu>
Date: Wed, 3 Oct 2012 19:20:21 +0000 (+0200)
Subject: MEDIUM: connection: don't call the data->init callback upon error
X-Git-Tag: v1.5-dev13~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78eaebed135600b07a442d9d3385eb721f432486;p=thirdparty%2Fhaproxy.git

MEDIUM: connection: don't call the data->init callback upon error

We don't call ->init() anymore upon error since we already call ->wake().
---

diff --git a/src/connection.c b/src/connection.c
index e156366f2b..40a24ee671 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -114,15 +114,6 @@ int conn_fd_handler(int fd)
 	}
 
  leave:
-	/* we may need to release the connection which is an embryonic session
-	 * in case of failure. For this we use the init callback which will
-	 * detect the error and clean everything up.
-	 */
-	if ((conn->flags & (CO_FL_ERROR|CO_FL_INIT_DATA)) == (CO_FL_ERROR|CO_FL_INIT_DATA)) {
-		conn->data->init(conn);
-		return 0;
-	}
-
 	/* The wake callback may be used to process a critical error and abort the
 	 * connection. If so, we don't want to go further as the connection will
 	 * have been released and the FD destroyed.