]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a68f631 008330e)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:05:12 +0000 (17:05 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:05:12 +0000 (17:05 -0700)
* PHP-5.5:
  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
Unnamed repository; edit this file 'description' to name the repository.