diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:05:12 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:05:12 -0700 |
| commit | 41fccab023cd07e9917b11767826c155808c0e06 (patch) | |
| tree | 38749db8ea15452188b1655dfd861ae243bf4938 /sapi/cli/php_cli.c | |
| parent | a68f63156c23a3aebbc4e7068610dbe85c670bda (diff) | |
| parent | 008330e5b30add0c1ef36408c25ca0f7ad9631f0 (diff) | |
| download | php-git-41fccab023cd07e9917b11767826c155808c0e06.tar.gz | |
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()
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions