Skip to content

Commit aa8817a

Browse files
nielsdosremicollet
nielsdos
authored and
remicollet
committed
Backport 4fe82131: Backport libxml2 2.13.2 fixes (#14816)
Backproted from php/php-src#14789 (cherry picked from commit bb46b4b799b583528025a775af45308133bfd4c1) (cherry picked from commit 6cb6882)
1 parent 087e974 commit aa8817a

16 files changed

+95
-25
lines changed

‎ext/dom/document.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,11 +1457,13 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
14571457
if (keep_blanks == 0 && ! (options & XML_PARSE_NOBLANKS)) {
14581458
options |= XML_PARSE_NOBLANKS;
14591459
}
1460+
if (recover) {
1461+
options |= XML_PARSE_RECOVER;
1462+
}
14601463

14611464
php_libxml_sanitize_parse_ctxt_options(ctxt);
14621465
xmlCtxtUseOptions(ctxt, options);
14631466

1464-
ctxt->recovery = recover;
14651467
if (recover) {
14661468
old_error_reporting = EG(error_reporting);
14671469
EG(error_reporting) = old_error_reporting | E_WARNING;
@@ -1471,7 +1473,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
14711473

14721474
if (ctxt->wellFormed || recover) {
14731475
ret = ctxt->myDoc;
1474-
if (ctxt->recovery) {
1476+
if (recover) {
14751477
EG(error_reporting) = old_error_reporting;
14761478
}
14771479
/* 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_relaxNGValidate_error2.phpt

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

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

‎ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Knut Urdalen <[email protected]>
66
--SKIPIF--
77
<?php
88
require_once __DIR__ .'/skipif.inc';
9+
if (LIBXML_VERSION >= 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
910
?>
1011
--FILE--
1112
<?php

‎ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Knut Urdalen <[email protected]>
66
--SKIPIF--
77
<?php
88
require_once __DIR__ .'/skipif.inc';
9+
if (LIBXML_VERSION >= 21300) die("skip see https://gitlab.gnome.org/GNOME/libxml2/-/issues/756");
910
?>
1011
--FILE--
1112
<?php

‎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 <[email protected]>
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 <[email protected]>
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
@@ -476,8 +476,10 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
476476
static xmlOutputBufferPtr
477477
php_libxml_output_buffer_create_filename(const char *URI,
478478
xmlCharEncodingHandlerPtr encoder,
479-
int compression ATTRIBUTE_UNUSED)
479+
int compression)
480480
{
481+
ZEND_IGNORE_VALUE(compression);
482+
481483
xmlOutputBufferPtr ret;
482484
xmlURIPtr puri;
483485
void *context = NULL;

‎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%00foo" 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
@@ -3381,7 +3381,6 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns)
33813381
} else {
33823382
smart_str prefix = {0};
33833383
int num = ++SOAP_GLOBAL(cur_uniq_ns);
3384-
xmlChar *enc_ns;
33853384

33863385
while (1) {
33873386
smart_str_appendl(&prefix, "ns", 2);
@@ -3395,9 +3394,15 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns)
33953394
num = ++SOAP_GLOBAL(cur_uniq_ns);
33963395
}
33973396

3398-
enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
3397+
/* Starting with libxml 2.13, we don't have to do this workaround anymore, otherwise we get double-encoded
3398+
* entities. See libxml2 commit f506ec66547ef9bac97a2bf306d368ecea8c0c9e. */
3399+
#if LIBXML_VERSION < 21300
3400+
xmlChar *enc_ns = xmlEncodeSpecialChars(node->doc, BAD_CAST(ns));
33993401
xmlns = xmlNewNs(node->doc->children, enc_ns, BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
34003402
xmlFree(enc_ns);
3403+
#else
3404+
xmlns = xmlNewNs(node->doc->children, BAD_CAST(ns), BAD_CAST(prefix.s ? ZSTR_VAL(prefix.s) : ""));
3405+
#endif
34013406
smart_str_free(&prefix);
34023407
}
34033408
}

‎ext/soap/php_xml.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,14 @@ xmlDocPtr soap_xmlParseFile(const char *filename)
9494
zend_bool old;
9595

9696
php_libxml_sanitize_parse_ctxt_options(ctxt);
97+
/* TODO: In libxml2 2.14.0 change this to the new options API so we don't rely on deprecated APIs. */
9798
ctxt->keepBlanks = 0;
99+
ctxt->options |= XML_PARSE_HUGE;
98100
ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
99101
ctxt->sax->comment = soap_Comment;
100102
ctxt->sax->warning = NULL;
101103
ctxt->sax->error = NULL;
102104
/*ctxt->sax->fatalError = NULL;*/
103-
ctxt->options |= XML_PARSE_HUGE;
104105
old = php_libxml_disable_entity_loader(1);
105106
xmlParseDocument(ctxt);
106107
php_libxml_disable_entity_loader(old);
@@ -148,6 +149,7 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size)
148149
ctxt->sax->warning = NULL;
149150
ctxt->sax->error = NULL;
150151
/*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. */
151153
ctxt->options |= XML_PARSE_HUGE;
152154
old = php_libxml_disable_entity_loader(1);
153155
xmlParseDocument(ctxt);

‎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
@@ -716,8 +716,7 @@ XML_GetCurrentByteCount(XML_Parser parser)
716716
{
717717
/* WARNING: this is identical to ByteIndex; it should probably
718718
* be different */
719-
return parser->parser->input->consumed +
720-
(parser->parser->input->cur - parser->parser->input->base);
719+
return XML_GetCurrentByteIndex(parser);
721720
}
722721

723722
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
@@ -1785,7 +1785,8 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
17851785
}
17861786
output_bytes = xmlTextWriterFlush(ptr);
17871787
if (buffer) {
1788-
RETVAL_STRING((char *) buffer->content);
1788+
const xmlChar *content = xmlBufferContent(buffer);
1789+
RETVAL_STRING((const char *) content);
17891790
if (empty) {
17901791
xmlBufferEmpty(buffer);
17911792
}

0 commit comments

Comments
 (0)