]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:09:09 +0000 (17:09 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:09:09 +0000 (17:09 -0700)
* PHP-5.6:
  fix test
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()


Trivial merge