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

Merge branch 'PHP-5.5' into PHP-5.6

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

41fccab023cd07e9917b11767826c155808c0e06