From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 3 Apr 2019 08:08:59 +0000 (+0200)
Subject: MINOR: http: update the macro IS_HTX_STRM() to check the stream flag SF_HTX
X-Git-Tag: v2.0-dev3~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209829f159f9d890e1826e3e3a81c19748e691f4;p=thirdparty%2Fhaproxy.git

MINOR: http: update the macro IS_HTX_STRM() to check the stream flag SF_HTX

Instead of matching on the frontend options, we now check if the flag SF_HTX is
set or not on the stream to know if it is an HTX stream or not.
---

diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index eecd9a7715..ef028cd600 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -29,7 +29,7 @@
 #include <proto/channel.h>
 #include <proto/stream.h>
 
-#define IS_HTX_STRM(strm) (strm_fe(strm)->options2 & PR_O2_USE_HTX)
+#define IS_HTX_STRM(strm) ((strm)->flags & SF_HTX)
 #define IS_HTX_SMP(smp)   ((smp)->strm && IS_HTX_STRM((smp)->strm))
 
 extern struct pool_head *pool_head_uniqueid;