- fix build with libxml2 2.12
This commit is contained in:
parent
5d639c7ccf
commit
3d4b4777ce
14
httpd-2.4.58-r1914013.patch
Normal file
14
httpd-2.4.58-r1914013.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# ./pullrev.sh 1914013
|
||||||
|
http://svn.apache.org/viewvc?view=revision&revision=1914013
|
||||||
|
|
||||||
|
--- httpd-2.4.58/modules/filters/mod_xml2enc.c
|
||||||
|
+++ httpd-2.4.58/modules/filters/mod_xml2enc.c
|
||||||
|
@@ -209,7 +209,7 @@
|
||||||
|
|
||||||
|
/* to sniff, first we look for BOM */
|
||||||
|
if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
|
||||||
|
- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
|
||||||
|
+ 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)
|
@ -101,6 +101,7 @@ Patch47: httpd-2.4.58-r1912477+.patch
|
|||||||
# Bug fixes
|
# Bug fixes
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
||||||
Patch60: httpd-2.4.43-enable-sslv3.patch
|
Patch60: httpd-2.4.43-enable-sslv3.patch
|
||||||
|
Patch61: httpd-2.4.58-r1914013.patch
|
||||||
Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
||||||
Patch65: httpd-2.4.51-r1894152.patch
|
Patch65: httpd-2.4.51-r1894152.patch
|
||||||
|
|
||||||
@ -275,6 +276,7 @@ written in the Lua programming language.
|
|||||||
%patch -P47 -p1 -b .r1912477+
|
%patch -P47 -p1 -b .r1912477+
|
||||||
|
|
||||||
%patch -P60 -p1 -b .enable-sslv3
|
%patch -P60 -p1 -b .enable-sslv3
|
||||||
|
%patch -P61 -p1 -b .r1914013
|
||||||
%patch -P63 -p1 -b .htcacheclean-dont-break
|
%patch -P63 -p1 -b .htcacheclean-dont-break
|
||||||
%patch -P65 -p1 -b .r1894152
|
%patch -P65 -p1 -b .r1894152
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user