mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-30 08:37:25 +00:00
88be6af76b
libxml has derecated the "xmlSetFeature" call, and hid is behind a special config flag (--with-legacy), which is not used by default in oe-core. This makes compilation fail, when "esi" PACKAGECONFIG is enabled: Libxml2Parser.cc:94:5: error: 'xmlSetFeature' was not declared in this scope; did you mean 'xmlHasFeature'? This backported patch fixes this. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From c312f7fa80371cc6db583590258381ebc7cd18f6 Mon Sep 17 00:00:00 2001
|
|
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
Date: Sun, 20 Feb 2022 19:42:40 +0000
|
|
Subject: [PATCH] ESI: Drop incorrect and unnecessary xmlSetFeature() call
|
|
(#988)
|
|
|
|
xmlSetFeature() has been deprecated for 10+ years and will eventually be
|
|
removed from libxml2. Squid calls xmlSetFeature() with the wrong
|
|
argument: a nil `value` pointer instead of a pointer to a zero value.
|
|
When called with a nil `value`, the function does nothing but returning
|
|
an error. Squid does not check whether xmlSetFeature() call is
|
|
successful, and the bug went unnoticed since libxml2 support was added
|
|
in commit 964b44c.
|
|
|
|
Since libxml2 does not substitute entities by default, the call can be
|
|
removed to achieve the intended effect.
|
|
|
|
Upstream-Status: Backport [https://github.com/squid-cache/squid/commit/5db4df2c6f83b5c26357f4439d28b92ef7071cd5]
|
|
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
|
---
|
|
src/esi/Libxml2Parser.cc | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc
|
|
index 2b9ba0a..0301b77 100644
|
|
--- a/src/esi/Libxml2Parser.cc
|
|
+++ b/src/esi/Libxml2Parser.cc
|
|
@@ -91,7 +91,6 @@ ESILibxml2Parser::ESILibxml2Parser(ESIParserClient *aClient) : theClient (aClien
|
|
|
|
/* TODO: grab the document encoding from the headers */
|
|
parser = xmlCreatePushParserCtxt(&sax, static_cast<void *>(this), NULL, 0, NULL);
|
|
- xmlSetFeature(parser, "substitute entities", 0);
|
|
|
|
if (entity_doc == NULL)
|
|
entity_doc = htmlNewDoc(NULL, NULL);
|