1 files changed, 4 insertions, 2 deletions

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index d8561251..9cdc06f1 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1940,7 +1940,8 @@ build_header_response (struct MHD_Connection *connection)
     }
     else if (MHD_CONN_USE_KEEPALIVE == c->keepalive)
     {
-      if (MHD_HTTP_VER_1_0 == c->http_ver)
+      if ((MHD_HTTP_VER_1_0 == c->http_ver) ||
+          (0 != (r->flags | MHD_RF_SEND_KEEP_ALIVE_HEADER)))
       {
         if (! buffer_append_s (buf, &pos, buf_size,
                                MHD_HTTP_HEADER_CONNECTION ": Keep-Alive\r\n"))
@@ -1954,7 +1955,8 @@ build_header_response (struct MHD_Connection *connection)
   if (! add_user_headers (buf, &pos, buf_size, r, MHD_HEADER_KIND,
                           ! c->rp_props.chunked,
                           (MHD_CONN_MUST_CLOSE == c->keepalive),
-                          (MHD_HTTP_VER_1_0 == c->http_ver) &&
+                          ((MHD_HTTP_VER_1_0 == c->http_ver) ||
+                           (0 != (r->flags | MHD_RF_SEND_KEEP_ALIVE_HEADER))) &&
                           (MHD_CONN_USE_KEEPALIVE == c->keepalive)))
     return MHD_NO;