archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* PHP-5.5:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
This commit is contained in:
Matteo Beccati 2014-06-09 07:07:17 +02:00
commit 6eaadc0228
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/dom/tests/DOMDocument_validate_external_dtd.phpt
View file

@ -12,6 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
// reusing existing xml: http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom.xml?view=co&content-type=text%2Fplain // reusing existing xml: http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom.xml?view=co&content-type=text%2Fplain
// reusing existing dtd: http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom.ent?view=co&content-type=text%2Fplain // reusing existing dtd: http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom.ent?view=co&content-type=text%2Fplain
$dom = new DOMDocument('1.0'); $dom = new DOMDocument('1.0');
$dom->substituteEntities = true;
$dom->load(dirname(__FILE__).'/dom.xml'); $dom->load(dirname(__FILE__).'/dom.xml');
var_dump($dom->validate()); var_dump($dom->validate());
?> ?>

4
ext/dom/tests/bug67081.phpt
View file

@ -7,18 +7,22 @@ require_once('skipif.inc');
--FILE-- --FILE--
<?php <?php
$domDocument = new DOMDocument(); $domDocument = new DOMDocument();
$domDocument->substituteEntities = true;
$domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_0.xml"); $domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_0.xml");
var_dump($domDocument->doctype->internalSubset); var_dump($domDocument->doctype->internalSubset);
$domDocument = new DOMDocument(); $domDocument = new DOMDocument();
$domDocument->substituteEntities = true;
$domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_1.xml"); $domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_1.xml");
var_dump($domDocument->doctype->internalSubset); var_dump($domDocument->doctype->internalSubset);
$domDocument = new DOMDocument(); $domDocument = new DOMDocument();
$domDocument->substituteEntities = true;
$domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_2.xml"); $domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug67081_2.xml");
var_dump($domDocument->doctype->internalSubset); var_dump($domDocument->doctype->internalSubset);
$domDocument = new DOMDocument(); $domDocument = new DOMDocument();
$domDocument->substituteEntities = true;
$domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "dom.xml"); $domDocument->load(dirname(__FILE__) . DIRECTORY_SEPARATOR . "dom.xml");
var_dump($domDocument->doctype->internalSubset); var_dump($domDocument->doctype->internalSubset);
?> ?>

1
ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
View file

@ -37,6 +37,7 @@ libxml_set_external_entity_loader(
); );
$dd = new DOMDocument; $dd = new DOMDocument;
$dd->substituteEntities = true;
$dd->resolveExternals = true; $dd->resolveExternals = true;
$r = $dd->loadXML($xml); $r = $dd->loadXML($xml);
var_dump($dd->validate()); var_dump($dd->validate());