Skip to content

Commit 4fe8213

Browse files
nielsdosnielsdos
authored
Backport libxml2 2.13.2 fixes (php#14816)
Backproted from php#14789
1 parent 7b74cad commit 4fe8213

19 files changed

+109
-27
lines changed

‎ext/dom/document.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,11 +1292,13 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
12921292
if (keep_blanks == 0 && ! (options & XML_PARSE_NOBLANKS)) {
12931293
options |= XML_PARSE_NOBLANKS;
12941294
}
1295+
if (recover) {
1296+
options |= XML_PARSE_RECOVER;
1297+
}
12951298

12961299
php_libxml_sanitize_parse_ctxt_options(ctxt);
12971300
xmlCtxtUseOptions(ctxt, options);
12981301

1299-
ctxt->recovery = recover;
13001302
if (recover) {
13011303
old_error_reporting = EG(error_reporting);
13021304
EG(error_reporting) = old_error_reporting | E_WARNING;
@@ -1306,7 +1308,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
13061308

13071309
if (ctxt->wellFormed || recover) {
13081310
ret = ctxt->myDoc;
1309-
if (ctxt->recovery) {
1311+
if (recover) {
13101312
EG(error_reporting) = old_error_reporting;
13111313
}
13121314
/* If loading from memory, set the base reference uri for the document */

‎ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ $result = $doc->loadHTMLFile(__DIR__ . "/ffff/test.html");
1515
assert($result === false);
1616
?>
1717
--EXPECTF--
18-
%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O warning : failed to load external entity %s
18+
%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O %s

‎ext/dom/tests/DOMDocument_loadXML_error2_gte2_12.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ domdocumentloadxml_test_method.inc
2323
--EXPECTF--
2424
Warning: DOMDocument::loadXML(): AttValue: " or ' expected in Entity, line: 4 in %s on line %d
2525

26-
Warning: DOMDocument::loadXML(): internal error: xmlParseStartTag: problem parsing attributes in Entity, line: 4 in %s on line %d
26+
Warning: DOMDocument::loadXML():%sattributes%s
2727

2828
Warning: DOMDocument::loadXML(): Couldn't find end of Start Tag book line 4 in Entity, line: 4 in %s on line %d
2929

‎ext/dom/tests/DOMDocument_load_error2_gte2_12.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ domdocumentload_test_method.inc
2323
--EXPECTF--
2424
Warning: DOMDocument::load(): AttValue: " or ' expected in %s on line %d
2525

26-
Warning: DOMDocument::load(): internal error: xmlParseStartTag: problem parsing attributes in %s on line %d
26+
Warning: DOMDocument::load():%sattributes%s
2727

2828
Warning: DOMDocument::load(): Couldn't find end of Start Tag book line 4 in %s on line %d
2929

‎ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $result = $doc->relaxNGValidate($rng);
2020
var_dump($result);
2121
?>
2222
--EXPECTF--
23-
Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external entity "%s/foo.rng" in %s on line %d
23+
Warning: DOMDocument::relaxNGValidate(): I/O %s : failed to load %s
2424

2525
Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
2626

‎ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Knut Urdalen <knut@php.net>
55
#PHPTestFest2009 Norway 2009-06-09 \o/
66
--EXTENSIONS--
77
dom
8+
--SKIPIF--
9+
<?php
10+
if (LIBXML_VERSION >= 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
11+
?>
812
--FILE--
913
<?php
1014
$filename = __DIR__."/DOMDocument_saveHTMLFile_basic.html";

‎ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Knut Urdalen <knut@php.net>
55
#PHPTestFest2009 Norway 2009-06-09 \o/
66
--EXTENSIONS--
77
dom
8+
--SKIPIF--
9+
<?php
10+
if (LIBXML_VERSION >= 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
11+
?>
812
--FILE--
913
<?php
1014
$filename = __DIR__."/DOMDocument_saveHTMLFile_formatOutput.html";

‎ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput_gte_2_13.phpt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
--TEST--
2+
DOMDocument::saveHTMLFile() should format output on demand
3+
--CREDITS--
4+
Knut Urdalen <knut@php.net>
5+
#PHPTestFest2009 Norway 2009-06-09 \o/
6+
--EXTENSIONS--
7+
dom
8+
--SKIPIF--
9+
<?php
10+
if (LIBXML_VERSION < 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
11+
?>
12+
--FILE--
13+
<?php
14+
$filename = __DIR__."/DOMDocument_saveHTMLFile_formatOutput_gte_2_13.html";
15+
$doc = new DOMDocument('1.0');
16+
$doc->formatOutput = true;
17+
$root = $doc->createElement('html');
18+
$root = $doc->appendChild($root);
19+
$head = $doc->createElement('head');
20+
$head = $root->appendChild($head);
21+
$title = $doc->createElement('title');
22+
$title = $head->appendChild($title);
23+
$text = $doc->createTextNode('This is the title');
24+
$text = $title->appendChild($text);
25+
$bytes = $doc->saveHTMLFile($filename);
26+
var_dump($bytes);
27+
echo file_get_contents($filename);
28+
unlink($filename);
29+
?>
30+
--EXPECT--
31+
int(59)
32+
<html><head><title>This is the title</title></head></html>

‎ext/dom/tests/DOMDocument_saveHTML_basic_gte_2_13.phpt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
--TEST--
2+
DOMDocument::saveHTMLFile() should dump the internal document into a file using HTML formatting
3+
--CREDITS--
4+
Knut Urdalen <knut@php.net>
5+
#PHPTestFest2009 Norway 2009-06-09 \o/
6+
--EXTENSIONS--
7+
dom
8+
--SKIPIF--
9+
<?php
10+
if (LIBXML_VERSION < 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
11+
?>
12+
--FILE--
13+
<?php
14+
$filename = __DIR__."/DOMDocument_saveHTMLFile_basic_gte_2_13.html";
15+
$doc = new DOMDocument('1.0');
16+
$root = $doc->createElement('html');
17+
$root = $doc->appendChild($root);
18+
$head = $doc->createElement('head');
19+
$head = $root->appendChild($head);
20+
$title = $doc->createElement('title');
21+
$title = $head->appendChild($title);
22+
$text = $doc->createTextNode('This is the title');
23+
$text = $title->appendChild($text);
24+
$bytes = $doc->saveHTMLFile($filename);
25+
var_dump($bytes);
26+
echo file_get_contents($filename);
27+
unlink($filename);
28+
?>
29+
--EXPECT--
30+
int(59)
31+
<html><head><title>This is the title</title></head></html>

‎ext/dom/tests/DOMDocument_schemaValidate_error5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var_dump($result);
1717

1818
?>
1919
--EXPECTF--
20-
Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
20+
Warning: DOMDocument::schemaValidate(): I/O %s : failed to load %s
2121

2222
Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
2323

‎ext/dom/tests/dom_create_element.phpt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,10 @@ try {
251251
print $e->getMessage() . "\n";
252252
}
253253

254-
/* This isn't because the xml namespace isn't there and we can't create it */
255-
print "29 DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace')\n";
256-
try {
257-
$element = new DomElement('xml:valid', '', 'http://www.w3.org/XML/1998/namespace');
258-
print "valid\n";
259-
} catch (Exception $e) {
260-
print $e->getMessage() . "\n";
261-
}
254+
/* There used to be a 29 here that tested DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace').
255+
* In libxml2 version 2.12 or prior this didn't work because the xml namespace isn't there and you can't create it without
256+
* a document. Starting from libxml2 version 2.13 it does actually work because the XML namespace is statically defined.
257+
* The behaviour from version 2.13 is actually the desired behaviour anyway. */
262258

263259

264260
/* the qualifiedName or its prefix is "xmlns" and the namespaceURI is
@@ -378,8 +374,6 @@ Namespace Error
378374
Namespace Error
379375
28 DOMDocument::createElementNS('http://www.w3.org/XML/1998/namespace', 'xml:valid')
380376
valid
381-
29 DOMElement::__construct('xml:valid', '', 'http://www.w3.org/XML/1998/namespace')
382-
Namespace Error
383377
30 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xmlns:valid')
384378
Namespace Error
385379
31 DOMElement::__construct('xmlns:valid', '', 'http://wrong.namespaceURI.com')

‎ext/libxml/libxml.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,10 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
419419
static xmlOutputBufferPtr
420420
php_libxml_output_buffer_create_filename(const char *URI,
421421
xmlCharEncodingHandlerPtr encoder,
422-
int compression ATTRIBUTE_UNUSED)
422+
int compression)
423423
{
424+
ZEND_IGNORE_VALUE(compression);
425+
424426
xmlOutputBufferPtr ret;
425427
xmlURIPtr puri;
426428
void *context = NULL;

‎ext/libxml/php_libxml.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,15 @@ ZEND_TSRMLS_CACHE_EXTERN()
167167
* Generally faster because no locking is involved, and this has the advantage that it sets the options to a known good value. */
168168
static zend_always_inline void php_libxml_sanitize_parse_ctxt_options(xmlParserCtxtPtr ctxt)
169169
{
170+
PHP_LIBXML_IGNORE_DEPRECATIONS_START
170171
ctxt->loadsubset = 0;
171172
ctxt->validate = 0;
172173
ctxt->pedantic = 0;
173174
ctxt->replaceEntities = 0;
174175
ctxt->linenumbers = 0;
175176
ctxt->keepBlanks = 1;
176177
ctxt->options = 0;
178+
PHP_LIBXML_IGNORE_DEPRECATIONS_END
177179
}
178180

179181
#else /* HAVE_LIBXML */

‎ext/simplexml/tests/bug79971_1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var_dump($sxe->asXML("$uri.out%00foo"));
2020
--EXPECTF--
2121
Warning: simplexml_load_file(): URI must not contain percent-encoded NUL bytes in %s on line %d
2222

23-
Warning: simplexml_load_file(): I/O warning : failed to load external entity "%s/bug79971_1.xml%%r00%rfoo" in %s on line %d
23+
Warning: simplexml_load_file(): I/O warning : failed to load %s
2424
bool(false)
2525

2626
Warning: SimpleXMLElement::asXML(): URI must not contain percent-encoded NUL bytes in %s on line %d

‎ext/soap/php_encoding.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3374,7 +3374,6 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns)
33743374
} else {
33753375
smart_str prefix = {0};
33763376
int num = ++SOAP_GLOBAL(cur_uniq_ns);
3377-
xmlChar *enc_ns;
33783377

33793378
while (1) {
33803379
smart_str_appendl(&prefix, "ns", 2);
@@ -3388,9 +3387,15 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns)
33883387
num = ++SOAP_GLOBAL(cur_uniq_ns);
33893388
}
33903389

3391-
enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
3390+
/* Starting with libxml 2.13, we don't have to do this workaround anymore, otherwise we get double-encoded
3391+
* entities. See libxml2 commit f506ec66547ef9bac97a2bf306d368ecea8c0c9e. */
3392+
#if LIBXML_VERSION < 21300
3393+
xmlChar *enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
33923394
xmlns = xmlNewNs(node->doc->children, enc_ns, BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
33933395
xmlFree(enc_ns);
3396+
#else
3397+
xmlns = xmlNewNs(node->doc->children, BAD_CAST(ns), BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
3398+
#endif
33943399
smart_str_free(&prefix);
33953400
}
33963401
}

‎ext/soap/php_xml.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,16 @@ xmlDocPtr soap_xmlParseFile(const char *filename)
9292
bool old;
9393

9494
php_libxml_sanitize_parse_ctxt_options(ctxt);
95+
/* TODO: In libxml2 2.14.0 change this to the new options API so we don't rely on deprecated APIs. */
96+
PHP_LIBXML_IGNORE_DEPRECATIONS_START
9597
ctxt->keepBlanks = 0;
98+
ctxt->options |= XML_PARSE_HUGE;
99+
PHP_LIBXML_IGNORE_DEPRECATIONS_END
96100
ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
97101
ctxt->sax->comment = soap_Comment;
98102
ctxt->sax->warning = NULL;
99103
ctxt->sax->error = NULL;
100104
/*ctxt->sax->fatalError = NULL;*/
101-
ctxt->options |= XML_PARSE_HUGE;
102105
old = php_libxml_disable_entity_loader(1);
103106
xmlParseDocument(ctxt);
104107
php_libxml_disable_entity_loader(old);
@@ -146,7 +149,10 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size)
146149
ctxt->sax->warning = NULL;
147150
ctxt->sax->error = NULL;
148151
/*ctxt->sax->fatalError = NULL;*/
152+
/* TODO: In libxml2 2.14.0 change this to the new options API so we don't rely on deprecated APIs. */
153+
PHP_LIBXML_IGNORE_DEPRECATIONS_START
149154
ctxt->options |= XML_PARSE_HUGE;
155+
PHP_LIBXML_IGNORE_DEPRECATIONS_END
150156
old = php_libxml_disable_entity_loader(1);
151157
xmlParseDocument(ctxt);
152158
php_libxml_disable_entity_loader(old);

‎ext/soap/tests/bugs/bug42151.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ try {
2525
}
2626
echo "ok\n";
2727
?>
28-
--EXPECT--
29-
SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load external entity "httpx://"
28+
--EXPECTF--
29+
SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://' : failed to load %s
3030

3131
ok
3232
I don't get executed either.

‎ext/xml/compat.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,8 +714,7 @@ XML_GetCurrentByteCount(XML_Parser parser)
714714
{
715715
/* WARNING: this is identical to ByteIndex; it should probably
716716
* be different */
717-
return parser->parser->input->consumed +
718-
(parser->parser->input->cur - parser->parser->input->base);
717+
return XML_GetCurrentByteIndex(parser);
719718
}
720719

721720
PHP_XML_API const XML_Char *XML_ExpatVersion(void)

‎ext/xmlwriter/php_xmlwriter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,8 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
10041004
}
10051005
output_bytes = xmlTextWriterFlush(ptr);
10061006
if (buffer) {
1007-
RETVAL_STRING((char *) buffer->content);
1007+
const xmlChar *content = xmlBufferContent(buffer);
1008+
RETVAL_STRING((const char *) content);
10081009
if (empty) {
10091010
xmlBufferEmpty(buffer);
10101011
}

0 commit comments

Comments
 (0)