]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: session: don't rely on s->logs.logwait in embryonic sessions
authorWilly Tarreau <w@1wt.eu>
Sat, 4 Apr 2015 12:54:14 +0000 (14:54 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 6 Apr 2015 09:37:30 +0000 (11:37 +0200)
The embryonic session now only stores the task (to expire the session)
and the stick counters.

src/stream.c

index ea1a0b069fa507439cdca057ca518566becc30bd..1fba4513a78529780dd6561e0cf2b1f96895f336 100644 (file)
@@ -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);
 }