BUG/MINOR: cache: also consider CF_SHUTR to abort delivery

The cache runs in an applet, so it delivers data into the input side
of the channel's buffer. Thus it must also abort feeding the buffer
as soon as CF_SHUTR is present, not just CF_SHUTW*, since these last
ones may only appear later. There doesn't seem to be an observable
side effect of this bug, the fix probably doesn't even need to be
backported.

diff --git a/src/cache.c b/src/cache.c
index c3d44f5db6ede30aa5dea7b12aa5c09f20f4bcfd..0322552241028d82a74507de17bd1e75c417721e 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -961,7 +961,7 @@ static void htx_cache_io_handler(struct appctx *appctx)
                goto out;
        }
 
-       if (res->flags & (CF_SHUTW|CF_SHUTW_NOW))
+       if (res->flags & (CF_SHUTW|CF_SHUTR|CF_SHUTW_NOW))
                appctx->st0 = HTX_CACHE_END;
 
        if (appctx->st0 == HTX_CACHE_INIT) {
@@ -1190,7 +1190,7 @@ static void http_cache_io_handler(struct appctx *appctx)
                goto out;
        }
 
-       if (res->flags & (CF_SHUTW|CF_SHUTW_NOW))
+       if (res->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_SHUTR))
                appctx->st0 = HTTP_CACHE_END;
 
        /* buffer are aligned there, should be fine */