MINOR: httpclient: httpclient_ended() returns 1 if the client ended

httpclient_ended() returns 1 if there is no more data to collect,
because the client received everything or the connection ended.

diff --git a/include/haproxy/http_client-t.h b/include/haproxy/http_client-t.h
index 079afdc08c8cc73e0e373a1be6ca8a00a6fa6d1c..611d56829d0c0f35cf87150e8c029caec6073ed1 100644 (file)
--- a/include/haproxy/http_client-t.h
+++ b/include/haproxy/http_client-t.h
@@ -27,8 +27,11 @@ struct httpclient {
        struct sockaddr_storage dst;          /* destination address */
        struct appctx *appctx;                /* HTTPclient appctx */
        void *caller;                         /* ptr of the caller */
+       unsigned int flags;                   /* other flags */
 };
 
+#define    HTTPCLIENT_F_ENDED        0x00000001
+
 /* States of the HTTP Client Appctx */
 enum {
        HTTPCLIENT_S_REQ = 0,

diff --git a/include/haproxy/http_client.h b/include/haproxy/http_client.h
index af7a17e3427cbb479f9b02b60a59fbf76eb79008..e4f6fb04c440f0e2c1e94439c28a555661c191fe 100644 (file)
--- a/include/haproxy/http_client.h
+++ b/include/haproxy/http_client.h
@@ -17,4 +17,10 @@ static inline int httpclient_data(struct httpclient *hc)
        return b_data(&hc->res.buf);
 }
 
+/* Return 1 if the httpclient ended and won't receive any new data */
+static inline int httpclient_ended(struct httpclient *hc)
+{
+       return !!(hc->flags & HTTPCLIENT_F_ENDED);
+}
+
 #endif /* ! _HAPROXY_HTTCLIENT_H */

diff --git a/src/http_client.c b/src/http_client.c
index d6889366e3e39554f99b3b4c5160ef1d550563c9..bafeafcacd3c78b00bea3d37eb4df43a189ea139 100644 (file)
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -559,10 +559,12 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
 
                                        /* if there is no HTX data anymore and the EOM flag is
                                         * set, leave (no body) */
-                                       if (htx_is_empty(htx) && htx->flags & HTX_FL_EOM)
+                                       if (htx_is_empty(htx) && htx->flags & HTX_FL_EOM) {
                                                appctx->st0 = HTTPCLIENT_S_RES_END;
-                                       else
+                                               hc->flags |= HTTPCLIENT_F_ENDED;
+                                       } else {
                                                appctx->st0 = HTTPCLIENT_S_RES_BODY;
+                                       }
                                }
                        break;
 
@@ -648,6 +650,8 @@ static void httpclient_applet_release(struct appctx *appctx)
 {
        struct httpclient *hc = appctx->ctx.httpclient.ptr;
 
+       /* mark the httpclient as ended */
+       hc->flags |= HTTPCLIENT_F_ENDED;
        /* the applet is leaving, remove the ptr so we don't try to call it
         * again from the caller */
        hc->appctx = NULL;