*) mod_xml2enc: Fix problems with charset conversion altering the

     Content-Length. [Micha Lenk <micha lenk info>]

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

diff --git a/CHANGES b/CHANGES
index ddf11732ea94456d5709a4460cf2537b0654ddda..6ab23424db4e4b8f5213dcbada5e92ff85af1dea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_xml2enc: Fix problems with charset conversion altering the
+     Content-Length. [Micha Lenk <micha lenk info>]
+
   *) core: New directive HttpProtocol which allows to disable HTTP/0.9
      support. [Stefan Fritsch]
 

diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index f82f8bf50b45179f8e80a646ff191e8f9a15ddc0..a4202a288e98fe111da8faf287ee36a65d20f89e 100644 (file)
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -370,6 +370,9 @@ static apr_status_t xml2enc_ffunc(ap_filter_t* f, apr_bucket_brigade* bb)
         /* nah, we only have one action here - call it inline */
         fix_skipto(f->r, ctx);
 
+        /* we might change the Content-Length, so let's force its re-calculation */
+        apr_table_unset(f->r->headers_out, "Content-Length");
+
         /* consume the data we just sniffed */
         /* we need to omit any <meta> we just invalidated */
         ctx->flags |= ENC_INITIALISED;