From: Willy Tarreau <w@1wt.eu>
Date: Sat, 4 Apr 2015 12:54:14 +0000 (+0200)
Subject: MINOR: session: don't rely on s->logs.logwait in embryonic sessions
X-Git-Tag: v1.6-dev2~257
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d2eca73ebc246071e4d6c3dbf46088127fc63ba;p=thirdparty%2Fhaproxy.git

MINOR: session: don't rely on s->logs.logwait in embryonic sessions

The embryonic session now only stores the task (to expire the session)
and the stick counters.
---

diff --git a/src/stream.c b/src/stream.c
index ea1a0b069f..1fba4513a7 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -301,7 +301,7 @@ static void kill_mini_session(struct stream *s)
 	int level = LOG_INFO;
 	struct session *sess = s->sess;
 	struct connection *conn = __objt_conn(sess->origin);
-	unsigned int log = s->logs.logwait;
+	unsigned int log = sess->fe->to_log;
 	const char *err_msg;
 
 	if (sess->fe->options2 & PR_O2_LOGERRORS)
@@ -359,7 +359,7 @@ static void kill_mini_session(struct stream *s)
 	/* FIXME: for now we have a 1:1 relation between stream and session so
 	 * the stream must free the session.
 	 */
-	pool_free2(pool2_session, s->sess);
+	pool_free2(pool2_session, sess);
 	pool_free2(pool2_stream, s);
 }