Skip to content

Commit 24495ba

Browse files
committed
Merge branch 'PHP-7.4' into master
* PHP-7.4: Enable libxml entity loader test case on Windows
2 parents 7d4ae7f + d4b32e8 commit 24495ba

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/libxml/tests/libxml_disable_entity_loader.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ libxml_disable_entity_loader()
44
<?php
55
if (!extension_loaded('libxml')) die('skip libxml extension not available');
66
if (!extension_loaded('dom')) die('skip dom extension not available');
7-
if (defined('PHP_WINDOWS_VERSION_MAJOR')) die('skip not for Windows'); ?>
87
--FILE--
98
<?php
109

@@ -14,7 +13,8 @@ $xml = <<<EOT
1413
<foo>&xxe;</foo>
1514
EOT;
1615

17-
$xml = str_replace('XXE_URI', __DIR__ . '/libxml_disable_entity_loader_payload.txt', $xml);
16+
$dir = str_replace('\\', '/', __DIR__);
17+
$xml = str_replace('XXE_URI', $dir . '/libxml_disable_entity_loader_payload.txt', $xml);
1818

1919
function parseXML($xml) {
2020
$doc = new DOMDocument();

0 commit comments

Comments
 (0)