From: Stanislav Malyshev <stas@php.net>
Date: Fri, 15 Aug 2014 00:09:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41177c1b65340a97ea5d0266bb506af3e77ffbf4;p=php

Merge branch 'PHP-5.6'

* 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()
---

41177c1b65340a97ea5d0266bb506af3e77ffbf4