From: Joe Orton <jorton@apache.org>
Date: Wed, 3 Jan 2024 15:02:30 +0000 (+0000)
Subject: Merge r1914013 from trunk:
X-Git-Tag: 2.4.59-rc1-candidate~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10ceb162d60f87e113cef4ef6316b1bf072901b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1914013 from trunk:

mod_xml2enc: remove dependency on xmlstring header

Submitted by: ttachi <tachihara hotmail.com>
Github: closes #393
Reviewed by: covener, minfrin, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915066 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt
new file mode 100644
index 00000000000..d0e06300411
--- /dev/null
+++ b/changes-entries/xmlchar.txt
@@ -0,0 +1,2 @@
+ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later.
+    [ttachi <tachihara AT hotmail.com>]
diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index 76046b48ed2..9e3bc314f4e 100644
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
             }
         }
     }
-  
+
     /* to sniff, first we look for BOM */
     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
-        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
-                                             ctx->bytes); 
+        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
+                                             ctx->bytes);
         if (HAVE_ENCODING(ctx->xml2enc)) {
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
                           "Got charset from XML rules.") ;