diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-08-03 09:15:50 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-08-03 09:15:50 +0200 |
| commit | 24495ba7780b0656a753678c6337d7a479d35ed3 (patch) | |
| tree | 883f9cc4460862ab8bb8906993eaefbaa24bd883 | |
| parent | 7d4ae7fa235301031590a774802fc343e3e42856 (diff) | |
| parent | d4b32e82c81073613eae4c363f9953d5fc355023 (diff) | |
| download | php-git-24495ba7780b0656a753678c6337d7a479d35ed3.tar.gz | |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Enable libxml entity loader test case on Windows
| -rw-r--r-- | ext/libxml/tests/libxml_disable_entity_loader.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/libxml/tests/libxml_disable_entity_loader.phpt b/ext/libxml/tests/libxml_disable_entity_loader.phpt index 7633a889f3..790a98db16 100644 --- a/ext/libxml/tests/libxml_disable_entity_loader.phpt +++ b/ext/libxml/tests/libxml_disable_entity_loader.phpt @@ -4,7 +4,6 @@ libxml_disable_entity_loader() <?php if (!extension_loaded('libxml')) die('skip libxml extension not available'); if (!extension_loaded('dom')) die('skip dom extension not available'); -if (defined('PHP_WINDOWS_VERSION_MAJOR')) die('skip not for Windows'); ?> --FILE-- <?php @@ -14,7 +13,8 @@ $xml = <<<EOT <foo>&xxe;</foo> EOT; -$xml = str_replace('XXE_URI', __DIR__ . '/libxml_disable_entity_loader_payload.txt', $xml); +$dir = str_replace('\\', '/', __DIR__); +$xml = str_replace('XXE_URI', $dir . '/libxml_disable_entity_loader_payload.txt', $xml); function parseXML($xml) { $doc = new DOMDocument(); |