MINOR: httpclient: destroy checks if a client was started but not stopped

During httpclient_destroy, add a condition in the BUG_ON which checks
that the client was started before it has ended. A httpclient structure
could have been created without being started.

diff --git a/include/haproxy/http_client.h b/include/haproxy/http_client.h
index c0d5447815258a03637eec0c40a72819d05c55d0..097997eb5379560ed8f0dccbd72cc80dc6d08ec4 100644 (file)
--- a/include/haproxy/http_client.h
+++ b/include/haproxy/http_client.h
@@ -24,4 +24,11 @@ static inline int httpclient_ended(struct httpclient *hc)
        return !!(hc->flags & HTTPCLIENT_FS_ENDED);
 }
 
+/* Return 1 if the httpclient started */
+static inline int httpclient_started(struct httpclient *hc)
+{
+
+       return !!(hc->flags & HTTPCLIENT_FS_STARTED);
+}
+
 #endif /* ! _HAPROXY_HTTCLIENT_H */

diff --git a/src/http_client.c b/src/http_client.c
index 1eb3cd18a3d4d641ce91bb5483568a88da6ed992..d0a100531c59c8b1567b8ef16018df00fde2e3c3 100644 (file)
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -438,8 +438,8 @@ void httpclient_destroy(struct httpclient *hc)
        if (!hc)
                return;
 
-       /* we should never destroy a client which was not stopped */
-       BUG_ON(!httpclient_ended(hc));
+       /* we should never destroy a client which was started but not stopped  */
+       BUG_ON(httpclient_started(hc) && !httpclient_ended(hc));
 
        /* request */
        istfree(&hc->req.url);