From: Willy Tarreau <w@1wt.eu>
Date: Sun, 30 Nov 2008 20:13:54 +0000 (+0100)
Subject: [CLEANUP] session.c: removed some migration left-overs in sess_establish()
X-Git-Tag: v1.3.16-rc1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42ffbf248ba7734837406846dc3f71679da16393;p=thirdparty%2Fhaproxy.git

[CLEANUP] session.c: removed some migration left-overs in sess_establish()

A few obsolete fd manipulations were left in sess_establish. Obviously
they must go away.
---

diff --git a/src/session.c b/src/session.c
index 0550de1a4c..a36bee0640 100644
--- a/src/session.c
+++ b/src/session.c
@@ -298,24 +298,7 @@ void sess_establish(struct session *s, struct stream_interface *si)
 	struct buffer *req = si->ob;
 	struct buffer *rep = si->ib;
 
-	if (req->flags & BF_EMPTY) {
-		EV_FD_CLR(si->fd, DIR_WR);
-		req->wex = TICK_ETERNITY;
-	} else {
-		EV_FD_SET(si->fd, DIR_WR);
-		req->wex = tick_add_ifset(now_ms, s->be->timeout.server);
-		if (tick_isset(req->wex)) {
-			/* FIXME: to prevent the server from expiring read
-			 * timeouts during writes, we refresh it. */
-			rep->rex = req->wex;
-		}
-	}
-
 	if (s->be->mode == PR_MODE_TCP) { /* let's allow immediate data connection in this case */
-		if (!(rep->flags & BF_HIJACK)) {
-			EV_FD_SET(si->fd, DIR_RD);
-			rep->rex = tick_add_ifset(now_ms, s->be->timeout.server);
-		}
 		buffer_set_rlim(rep, BUFSIZE); /* no rewrite needed */
 
 		/* if the user wants to log as soon as possible, without counting