php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable old libxml2 hack if the version does not suffer from the bug (#11379)

Browse Source 
This bug is ancient, we'll keep the code but version check if with an
ifdef. This should also save some cycles.
This commit is contained in:
Niels Dossche
2023-06-06 20:06:20 +02:00
committed by GitHub
parent a02f7f24c6
commit e56904a573
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/dom/documentfragment.c
View File

@@ -57,6 +57,7 @@ PHP_METHOD(DOMDocumentFragment, __construct)
}
/* }}} end DOMDocumentFragment::__construct */
#if LIBXML_VERSION <= 20614
/* php_dom_xmlSetTreeDoc is a custom implementation of xmlSetTreeDoc
needed for hack in appendXML due to libxml bug - no need to share this function */
static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */
@@ -90,6 +91,7 @@ static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */
}
}
/* }}} */
#endif
/* {{{ */
PHP_METHOD(DOMDocumentFragment, appendXML) {
@@ -118,10 +120,11 @@ PHP_METHOD(DOMDocumentFragment, appendXML) {
if (err != 0) {
RETURN_FALSE;
}
/* Following needed due to bug in libxml2 <= 2.6.14
ifdef after next libxml release as bug is fixed in their cvs */
#if LIBXML_VERSION <= 20614
/* Following needed due to bug in libxml2 <= 2.6.14 */
php_dom_xmlSetTreeDoc(lst, nodep->doc);
/* End stupid hack */
#endif
xmlAddChildList(nodep,lst);
}