From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 13 Apr 2018 08:04:59 +0000 (+0000)
Subject: mod_xml2enc: follow up to r1829038.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=520827d4cf0e4d25aefe57aa7c9114dafd4c74fe;p=apache

mod_xml2enc: follow up to r1829038.

If any, pass pending meta bucket down the chain before leaving.



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

diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index ea7f0842e4..be07237d90 100644
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -547,8 +547,18 @@ static apr_status_t xml2enc_ffunc(ap_filter_t* f, apr_bucket_brigade* bb)
                 return rv;
         }
     }
+    if (pending_meta) {
+        /* passing pending meta bucket down the chain before leaving */
+        rv = ap_pass_brigade(f->next, ctx->bbnext);
+        apr_brigade_cleanup(ctx->bbnext);
+        if (rv != APR_SUCCESS) {
+            return rv;
+        }
+    }
+
     return APR_SUCCESS;
 }
+
 static apr_status_t xml2enc_charset(request_rec* r, xmlCharEncoding* encp,
                                     const char** encoding)
 {