]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch
wavemon: Update to version 0.9.5
[people/pmueller/ipfire-2.x.git] / src / patches / apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch
1 diff -Naur httpd-2.4.58-orig/changes-entries/xmlchar.txt httpd-2.4.58/changes-entries/xmlchar.txt
2 --- httpd-2.4.58-orig/changes-entries/xmlchar.txt 1970-01-01 01:00:00.000000000 +0100
3 +++ httpd-2.4.58/changes-entries/xmlchar.txt 2023-12-18 12:31:00.719087460 +0100
4 @@ -0,0 +1,2 @@
5 + *) mod_xml2enc: Tolerate libxml2 2.12.0 and later.
6 + [ttachi <tachihara AT hotmail.com>]
7 diff -Naur httpd-2.4.58-orig/modules/filters/mod_xml2enc.c httpd-2.4.58/modules/filters/mod_xml2enc.c
8 --- httpd-2.4.58-orig/modules/filters/mod_xml2enc.c 2020-02-21 01:33:40.000000000 +0100
9 +++ httpd-2.4.58/modules/filters/mod_xml2enc.c 2023-12-18 12:32:34.248535392 +0100
10 @@ -206,11 +206,11 @@
11 }
12 }
13 }
14 -
15 +
16 /* to sniff, first we look for BOM */
17 if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
18 - ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
19 - ctx->bytes);
20 + ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
21 + ctx->bytes);
22 if (HAVE_ENCODING(ctx->xml2enc)) {
23 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
24 "Got charset from XML rules.") ;