If we are going to get the length of a brigade, it helps if that

brigade has data.  To that end, if we have just expanded ctx->b, we need
to concat ctx->b to the end of b, so that b has something to pass
back to the previous filter.

This fixes the problem with the proxy not proxying non-keepalive
connections.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90046 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 8f183f41df1d8cb7416421388e107ba71ae96e58..397a269ed0f18f91ab5263372dc2e1657b9397cb 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -660,6 +660,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode
             apr_size_t len;
             apr_bucket_read(e, &str, &len, APR_BLOCK_READ);
         }
+        APR_BRIGADE_CONCAT(b, ctx->b);
         apr_brigade_length(b, 1, &total);
         *readbytes = total;
         e = apr_bucket_eos_create();