Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: one more extension for the basename test
aican0830 · Jan 5, 2014 · 748e707 · 748e707
2 parents 3bde9cf + 1c586d4
commit 748e707
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt
@@ -17,6 +17,7 @@ echo basename("a:\\b:\\c:d:hello\\world:some.stream") . "\n";
 echo basename("a:/b:\\c:d:hello\\world:some.stream:\$DATA") . "\n";
 echo basename("x:y:z:hello\world:my.stream:\$DATA") . "\n";
 echo basename("a:\\b:\\c:d:hello\\world:c:\$DATA") . "\n";
+echo basename("a:\\b:\\c:d:hello\\d:world:c:\$DATA") . "\n";
 ?>
 ==DONE==
 --EXPECTF--
@@ -33,4 +34,5 @@ world:some.stream
 world:some.stream:$DATA
 world:my.stream:$DATA
 world:c:$DATA
+world:c:$DATA
 ==DONE==