in_splunk: http_server: Add and handle no keepalive flag

Signed-off-by: Hiroshi Hatake <[email protected]>
fluent · Jun 28, 2024 · ce2d751 · ce2d751
1 parent 5534d44
commit ce2d751
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/include/fluent-bit/http_server/flb_http_server.h b/include/fluent-bit/http_server/flb_http_server.h
@@ -41,6 +41,7 @@
 
 #define FLB_HTTP_SERVER_FLAG_KEEPALIVE         (((uint64_t) 1) << 0)
 #define FLB_HTTP_SERVER_FLAG_AUTO_INFLATE      (((uint64_t) 1) << 1)
+#define FLB_HTTP_SERVER_FLAG_NO_KEEPALIVE      (((uint64_t) 1) << 2)
 
 #define HTTP_SERVER_SUCCESS                    0
 #define HTTP_SERVER_PROVIDER_ERROR            -1

diff --git a/plugins/in_splunk/splunk.c b/plugins/in_splunk/splunk.c
@@ -97,7 +97,7 @@ static int in_splunk_init(struct flb_input_instance *ins,
     if (ctx->enable_http2) {
         ret = flb_http_server_init(&ctx->http_server,
                                     HTTP_PROTOCOL_AUTODETECT,
-                                    FLB_HTTP_SERVER_FLAG_AUTO_INFLATE,
+                                   (FLB_HTTP_SERVER_FLAG_AUTO_INFLATE | FLB_HTTP_SERVER_FLAG_NO_KEEPALIVE),
                                     NULL,
                                     ins->host.listen,
                                     ins->host.port,

diff --git a/src/http_server/flb_http_server.c b/src/http_server/flb_http_server.c
@@ -485,8 +485,9 @@ int flb_http_server_init(struct flb_http_server *session,
 
     session->downstream = NULL;
 
-    if (networking_setup->keepalive) {
-        session->flags = FLB_HTTP_SERVER_FLAG_KEEPALIVE | FLB_HTTP_SERVER_FLAG_AUTO_INFLATE;
+    if (networking_setup->keepalive &&
+        !(flags & FLB_HTTP_SERVER_FLAG_NO_KEEPALIVE)) {
+        session->flags |= FLB_HTTP_SERVER_FLAG_KEEPALIVE;
     }
 
     cfl_list_init(&session->clients);