diff options
author | Anatoliy Belsky <ab@php.net> | 2012-04-16 15:46:02 +0200 |
---|---|---|
committer | Anatoliy Belsky <ab@php.net> | 2012-04-16 15:46:02 +0200 |
commit | 3d106aeb0d9b1d2c03483f96e3250afa023c942d (patch) | |
tree | b7e6ae3f584645df4e662f737d346a3c7b296f76 /ext/libxml | |
parent | 4ac6862fc461ff475994a2c3f001cde353034ca3 (diff) | |
parent | bceafee879785b176e6b4564908d0b2c82cb6a0b (diff) | |
download | php-git-3d106aeb0d9b1d2c03483f96e3250afa023c942d.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
Diffstat (limited to 'ext/libxml')
-rw-r--r-- | ext/libxml/tests/bug61367-read.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt index 722b8e704e..3deecfc50f 100644 --- a/ext/libxml/tests/bug61367-read.phpt +++ b/ext/libxml/tests/bug61367-read.phpt @@ -15,6 +15,7 @@ class StreamExploiter { $doc->resolveExternals = true; $doc->substituteEntities = true; $dir = htmlspecialchars(dirname(getcwd())); + $dir = str_replace('\\', '/', $dir); // fix for windows $doc->loadXML( <<<XML <!DOCTYPE doc [ <!ENTITY file SYSTEM "file:///$dir/bad"> |